projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-scan', 'acpi-processor' and 'acpi-assorted'
[cascardo/linux.git]
/
arch
/
x86
/
kernel
/
fpu
/
init.c
diff --git
a/arch/x86/kernel/fpu/init.c
b/arch/x86/kernel/fpu/init.c
index
1e173f6
..
d14e9ac
100644
(file)
--- a/
arch/x86/kernel/fpu/init.c
+++ b/
arch/x86/kernel/fpu/init.c
@@
-40,7
+40,12
@@
static void fpu__init_cpu_generic(void)
write_cr0(cr0);
/* Flush out any pending x87 state: */
- asm volatile ("fninit");
+#ifdef CONFIG_MATH_EMULATION
+ if (!cpu_has_fpu)
+ fpstate_init_soft(¤t->thread.fpu.state.soft);
+ else
+#endif
+ asm volatile ("fninit");
}
/*