diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-27 21:45:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-27 21:45:31 -0700 |
| commit | 0d36938bb82a7775c21ce0a7429f08ba13d025b6 (patch) | |
| tree | f502caf5555591ee237e14e5fa96b2c005a85036 /arch/x86/kernel/fpu/init.c | |
| parent | 55f14da66954083b621debbdbf62c7fc429291e8 (diff) | |
| parent | 4941b8f0c2b9d88e8a6dacebf8b7faf603b98368 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/x86/kernel/fpu/init.c')
| -rw-r--r-- | arch/x86/kernel/fpu/init.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c index 1e173f6285c7..d14e9ac3235a 100644 --- 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"); } /* |