diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-07-06 10:23:00 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-07-06 10:23:00 -0700 |
| commit | 6a47a12fee7d1e842369798dc8134759561d5e75 (patch) | |
| tree | 14fec57680c2fbc8dc05376b5c14bf57996dc86f /arch/x86/kernel/i387.c | |
| parent | 91760bceff1f3f5860ff49c14194567f972352e6 (diff) | |
| parent | ea5dd38e93b3bec3427e5d3eef000bbf5d637e76 (diff) | |
Merge tag 'v3.18.17' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.18lsk-v3.18-15.07
Linux 3.18.17
Diffstat (limited to 'arch/x86/kernel/i387.c')
| -rw-r--r-- | arch/x86/kernel/i387.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index ae0fdc86b7b6..8d6e954db2a7 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c @@ -13,6 +13,7 @@ #include <asm/sigcontext.h> #include <asm/processor.h> #include <asm/math_emu.h> +#include <asm/tlbflush.h> #include <asm/uaccess.h> #include <asm/ptrace.h> #include <asm/i387.h> @@ -195,7 +196,7 @@ void fpu_init(void) if (cpu_has_xmm) cr4_mask |= X86_CR4_OSXMMEXCPT; if (cr4_mask) - set_in_cr4(cr4_mask); + cr4_set_bits(cr4_mask); cr0 = read_cr0(); cr0 &= ~(X86_CR0_TS|X86_CR0_EM); /* clear TS and EM */ |