diff options
30 files changed, 32 insertions, 32 deletions
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c index 112cefacf2af..b419f43ce0c5 100644 --- a/arch/x86/crypto/aesni-intel_glue.c +++ b/arch/x86/crypto/aesni-intel_glue.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <crypto/lrw.h> | 32 | #include <crypto/lrw.h> |
33 | #include <crypto/xts.h> | 33 | #include <crypto/xts.h> |
34 | #include <asm/cpu_device_id.h> | 34 | #include <asm/cpu_device_id.h> |
35 | #include <asm/i387.h> | 35 | #include <asm/fpu/api.h> |
36 | #include <asm/crypto/aes.h> | 36 | #include <asm/crypto/aes.h> |
37 | #include <crypto/ablk_helper.h> | 37 | #include <crypto/ablk_helper.h> |
38 | #include <crypto/scatterwalk.h> | 38 | #include <crypto/scatterwalk.h> |
diff --git a/arch/x86/crypto/crc32-pclmul_glue.c b/arch/x86/crypto/crc32-pclmul_glue.c index 1937fc1d8763..07d2c6c86a54 100644 --- a/arch/x86/crypto/crc32-pclmul_glue.c +++ b/arch/x86/crypto/crc32-pclmul_glue.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include <asm/cpufeature.h> | 36 | #include <asm/cpufeature.h> |
37 | #include <asm/cpu_device_id.h> | 37 | #include <asm/cpu_device_id.h> |
38 | #include <asm/i387.h> | 38 | #include <asm/fpu/api.h> |
39 | 39 | ||
40 | #define CHKSUM_BLOCK_SIZE 1 | 40 | #define CHKSUM_BLOCK_SIZE 1 |
41 | #define CHKSUM_DIGEST_SIZE 4 | 41 | #define CHKSUM_DIGEST_SIZE 4 |
diff --git a/arch/x86/crypto/crct10dif-pclmul_glue.c b/arch/x86/crypto/crct10dif-pclmul_glue.c index b6c67bf30fdf..a3fcfc97a311 100644 --- a/arch/x86/crypto/crct10dif-pclmul_glue.c +++ b/arch/x86/crypto/crct10dif-pclmul_glue.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
32 | #include <asm/i387.h> | 32 | #include <asm/fpu/api.h> |
33 | #include <asm/cpufeature.h> | 33 | #include <asm/cpufeature.h> |
34 | #include <asm/cpu_device_id.h> | 34 | #include <asm/cpu_device_id.h> |
35 | 35 | ||
diff --git a/arch/x86/crypto/fpu.c b/arch/x86/crypto/fpu.c index f368ba261739..5a2f30f9f52d 100644 --- a/arch/x86/crypto/fpu.c +++ b/arch/x86/crypto/fpu.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/crypto.h> | 20 | #include <linux/crypto.h> |
21 | #include <asm/i387.h> | 21 | #include <asm/fpu/api.h> |
22 | 22 | ||
23 | struct crypto_fpu_ctx { | 23 | struct crypto_fpu_ctx { |
24 | struct crypto_blkcipher *child; | 24 | struct crypto_blkcipher *child; |
diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c index 2079baf06bdd..64d7cf1b50e1 100644 --- a/arch/x86/crypto/ghash-clmulni-intel_glue.c +++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <crypto/cryptd.h> | 19 | #include <crypto/cryptd.h> |
20 | #include <crypto/gf128mul.h> | 20 | #include <crypto/gf128mul.h> |
21 | #include <crypto/internal/hash.h> | 21 | #include <crypto/internal/hash.h> |
22 | #include <asm/i387.h> | 22 | #include <asm/fpu/api.h> |
23 | #include <asm/cpu_device_id.h> | 23 | #include <asm/cpu_device_id.h> |
24 | 24 | ||
25 | #define GHASH_BLOCK_SIZE 16 | 25 | #define GHASH_BLOCK_SIZE 16 |
diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c index 33d1b9dc14cc..cb3bf19dca5a 100644 --- a/arch/x86/crypto/sha1_ssse3_glue.c +++ b/arch/x86/crypto/sha1_ssse3_glue.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/types.h> | 29 | #include <linux/types.h> |
30 | #include <crypto/sha.h> | 30 | #include <crypto/sha.h> |
31 | #include <crypto/sha1_base.h> | 31 | #include <crypto/sha1_base.h> |
32 | #include <asm/i387.h> | 32 | #include <asm/fpu/api.h> |
33 | #include <asm/xcr.h> | 33 | #include <asm/xcr.h> |
34 | #include <asm/xsave.h> | 34 | #include <asm/xsave.h> |
35 | 35 | ||
diff --git a/arch/x86/crypto/sha256_ssse3_glue.c b/arch/x86/crypto/sha256_ssse3_glue.c index ccc338881ee8..9eaf7abaf4dc 100644 --- a/arch/x86/crypto/sha256_ssse3_glue.c +++ b/arch/x86/crypto/sha256_ssse3_glue.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <linux/types.h> | 37 | #include <linux/types.h> |
38 | #include <crypto/sha.h> | 38 | #include <crypto/sha.h> |
39 | #include <crypto/sha256_base.h> | 39 | #include <crypto/sha256_base.h> |
40 | #include <asm/i387.h> | 40 | #include <asm/fpu/api.h> |
41 | #include <asm/xcr.h> | 41 | #include <asm/xcr.h> |
42 | #include <asm/xsave.h> | 42 | #include <asm/xsave.h> |
43 | #include <linux/string.h> | 43 | #include <linux/string.h> |
diff --git a/arch/x86/crypto/sha512_ssse3_glue.c b/arch/x86/crypto/sha512_ssse3_glue.c index d9fa4c1e063f..e0d6a67f567d 100644 --- a/arch/x86/crypto/sha512_ssse3_glue.c +++ b/arch/x86/crypto/sha512_ssse3_glue.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <linux/types.h> | 35 | #include <linux/types.h> |
36 | #include <crypto/sha.h> | 36 | #include <crypto/sha.h> |
37 | #include <crypto/sha512_base.h> | 37 | #include <crypto/sha512_base.h> |
38 | #include <asm/i387.h> | 38 | #include <asm/fpu/api.h> |
39 | #include <asm/xcr.h> | 39 | #include <asm/xcr.h> |
40 | #include <asm/xsave.h> | 40 | #include <asm/xsave.h> |
41 | 41 | ||
diff --git a/arch/x86/crypto/twofish_avx_glue.c b/arch/x86/crypto/twofish_avx_glue.c index b5e2d5651851..1a66e6110f4b 100644 --- a/arch/x86/crypto/twofish_avx_glue.c +++ b/arch/x86/crypto/twofish_avx_glue.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <crypto/ctr.h> | 36 | #include <crypto/ctr.h> |
37 | #include <crypto/lrw.h> | 37 | #include <crypto/lrw.h> |
38 | #include <crypto/xts.h> | 38 | #include <crypto/xts.h> |
39 | #include <asm/i387.h> | 39 | #include <asm/fpu/api.h> |
40 | #include <asm/xcr.h> | 40 | #include <asm/xcr.h> |
41 | #include <asm/xsave.h> | 41 | #include <asm/xsave.h> |
42 | #include <asm/crypto/twofish.h> | 42 | #include <asm/crypto/twofish.h> |
diff --git a/arch/x86/include/asm/crypto/glue_helper.h b/arch/x86/include/asm/crypto/glue_helper.h index 1eef55596e82..03bb1065c335 100644 --- a/arch/x86/include/asm/crypto/glue_helper.h +++ b/arch/x86/include/asm/crypto/glue_helper.h | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
9 | #include <linux/crypto.h> | 9 | #include <linux/crypto.h> |
10 | #include <asm/i387.h> | 10 | #include <asm/fpu/api.h> |
11 | #include <crypto/b128ops.h> | 11 | #include <crypto/b128ops.h> |
12 | 12 | ||
13 | typedef void (*common_glue_func_t)(void *ctx, u8 *dst, const u8 *src); | 13 | typedef void (*common_glue_func_t)(void *ctx, u8 *dst, const u8 *src); |
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 3738b138b843..155162ea0e00 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _ASM_X86_EFI_H | 1 | #ifndef _ASM_X86_EFI_H |
2 | #define _ASM_X86_EFI_H | 2 | #define _ASM_X86_EFI_H |
3 | 3 | ||
4 | #include <asm/i387.h> | 4 | #include <asm/fpu/api.h> |
5 | #include <asm/pgtable.h> | 5 | #include <asm/pgtable.h> |
6 | 6 | ||
7 | /* | 7 | /* |
diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h index 21ad68179454..d68b349b4247 100644 --- a/arch/x86/include/asm/fpu-internal.h +++ b/arch/x86/include/asm/fpu-internal.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
16 | 16 | ||
17 | #include <asm/user.h> | 17 | #include <asm/user.h> |
18 | #include <asm/i387.h> | 18 | #include <asm/fpu/api.h> |
19 | #include <asm/xsave.h> | 19 | #include <asm/xsave.h> |
20 | 20 | ||
21 | #ifdef CONFIG_X86_64 | 21 | #ifdef CONFIG_X86_64 |
diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/fpu/api.h index b8f7d76ac066..9d3a6f3cfc1b 100644 --- a/arch/x86/include/asm/i387.h +++ b/arch/x86/include/asm/fpu/api.h | |||
@@ -7,8 +7,8 @@ | |||
7 | * x86-64 work by Andi Kleen 2002 | 7 | * x86-64 work by Andi Kleen 2002 |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #ifndef _ASM_X86_I387_H | 10 | #ifndef _ASM_X86_FPU_API_H |
11 | #define _ASM_X86_I387_H | 11 | #define _ASM_X86_FPU_API_H |
12 | 12 | ||
13 | #ifndef __ASSEMBLY__ | 13 | #ifndef __ASSEMBLY__ |
14 | 14 | ||
@@ -104,4 +104,4 @@ extern void fpu__save(struct fpu *fpu); | |||
104 | 104 | ||
105 | #endif /* __ASSEMBLY__ */ | 105 | #endif /* __ASSEMBLY__ */ |
106 | 106 | ||
107 | #endif /* _ASM_X86_I387_H */ | 107 | #endif /* _ASM_X86_FPU_API_H */ |
diff --git a/arch/x86/include/asm/simd.h b/arch/x86/include/asm/simd.h index ee80b92f0096..6c8a7ed13365 100644 --- a/arch/x86/include/asm/simd.h +++ b/arch/x86/include/asm/simd.h | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | #include <asm/i387.h> | 2 | #include <asm/fpu/api.h> |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * may_use_simd - whether it is allowable at this time to issue SIMD | 5 | * may_use_simd - whether it is allowable at this time to issue SIMD |
diff --git a/arch/x86/include/asm/suspend_32.h b/arch/x86/include/asm/suspend_32.h index 552d6c90a6d4..d1793f06854d 100644 --- a/arch/x86/include/asm/suspend_32.h +++ b/arch/x86/include/asm/suspend_32.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #define _ASM_X86_SUSPEND_32_H | 7 | #define _ASM_X86_SUSPEND_32_H |
8 | 8 | ||
9 | #include <asm/desc.h> | 9 | #include <asm/desc.h> |
10 | #include <asm/i387.h> | 10 | #include <asm/fpu/api.h> |
11 | 11 | ||
12 | /* image of the saved processor state */ | 12 | /* image of the saved processor state */ |
13 | struct saved_context { | 13 | struct saved_context { |
diff --git a/arch/x86/include/asm/suspend_64.h b/arch/x86/include/asm/suspend_64.h index bc6232834bab..7ebf0ebe4e68 100644 --- a/arch/x86/include/asm/suspend_64.h +++ b/arch/x86/include/asm/suspend_64.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #define _ASM_X86_SUSPEND_64_H | 7 | #define _ASM_X86_SUSPEND_64_H |
8 | 8 | ||
9 | #include <asm/desc.h> | 9 | #include <asm/desc.h> |
10 | #include <asm/i387.h> | 10 | #include <asm/fpu/api.h> |
11 | 11 | ||
12 | /* | 12 | /* |
13 | * Image of the saved processor state, used by the low level ACPI suspend to | 13 | * Image of the saved processor state, used by the low level ACPI suspend to |
diff --git a/arch/x86/include/asm/xor.h b/arch/x86/include/asm/xor.h index d8829751b3f8..1f5c5161ead6 100644 --- a/arch/x86/include/asm/xor.h +++ b/arch/x86/include/asm/xor.h | |||
@@ -36,7 +36,7 @@ | |||
36 | * no advantages to be gotten from x86-64 here anyways. | 36 | * no advantages to be gotten from x86-64 here anyways. |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include <asm/i387.h> | 39 | #include <asm/fpu/api.h> |
40 | 40 | ||
41 | #ifdef CONFIG_X86_32 | 41 | #ifdef CONFIG_X86_32 |
42 | /* reduce register pressure */ | 42 | /* reduce register pressure */ |
diff --git a/arch/x86/include/asm/xor_32.h b/arch/x86/include/asm/xor_32.h index ce05722e3c68..5a08bc8bff33 100644 --- a/arch/x86/include/asm/xor_32.h +++ b/arch/x86/include/asm/xor_32.h | |||
@@ -26,7 +26,7 @@ | |||
26 | #define XO3(x, y) " pxor 8*("#x")(%4), %%mm"#y" ;\n" | 26 | #define XO3(x, y) " pxor 8*("#x")(%4), %%mm"#y" ;\n" |
27 | #define XO4(x, y) " pxor 8*("#x")(%5), %%mm"#y" ;\n" | 27 | #define XO4(x, y) " pxor 8*("#x")(%5), %%mm"#y" ;\n" |
28 | 28 | ||
29 | #include <asm/i387.h> | 29 | #include <asm/fpu/api.h> |
30 | 30 | ||
31 | static void | 31 | static void |
32 | xor_pII_mmx_2(unsigned long bytes, unsigned long *p1, unsigned long *p2) | 32 | xor_pII_mmx_2(unsigned long bytes, unsigned long *p1, unsigned long *p2) |
diff --git a/arch/x86/include/asm/xor_avx.h b/arch/x86/include/asm/xor_avx.h index 492b29802f57..7c0a517ec751 100644 --- a/arch/x86/include/asm/xor_avx.h +++ b/arch/x86/include/asm/xor_avx.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #ifdef CONFIG_AS_AVX | 18 | #ifdef CONFIG_AS_AVX |
19 | 19 | ||
20 | #include <linux/compiler.h> | 20 | #include <linux/compiler.h> |
21 | #include <asm/i387.h> | 21 | #include <asm/fpu/api.h> |
22 | 22 | ||
23 | #define BLOCK4(i) \ | 23 | #define BLOCK4(i) \ |
24 | BLOCK(32 * i, 0) \ | 24 | BLOCK(32 * i, 0) \ |
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index eb8be0c5823b..29dd74318ec6 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <asm/bugs.h> | 12 | #include <asm/bugs.h> |
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/processor-flags.h> | 14 | #include <asm/processor-flags.h> |
15 | #include <asm/i387.h> | 15 | #include <asm/fpu/api.h> |
16 | #include <asm/msr.h> | 16 | #include <asm/msr.h> |
17 | #include <asm/paravirt.h> | 17 | #include <asm/paravirt.h> |
18 | #include <asm/alternative.h> | 18 | #include <asm/alternative.h> |
diff --git a/arch/x86/kernel/fpu/xsave.c b/arch/x86/kernel/fpu/xsave.c index 80b0c8fa50c5..8aa3b864a2e0 100644 --- a/arch/x86/kernel/fpu/xsave.c +++ b/arch/x86/kernel/fpu/xsave.c | |||
@@ -9,7 +9,7 @@ | |||
9 | #include <linux/bootmem.h> | 9 | #include <linux/bootmem.h> |
10 | #include <linux/compat.h> | 10 | #include <linux/compat.h> |
11 | #include <linux/cpu.h> | 11 | #include <linux/cpu.h> |
12 | #include <asm/i387.h> | 12 | #include <asm/fpu/api.h> |
13 | #include <asm/fpu-internal.h> | 13 | #include <asm/fpu-internal.h> |
14 | #include <asm/sigframe.h> | 14 | #include <asm/sigframe.h> |
15 | #include <asm/tlbflush.h> | 15 | #include <asm/tlbflush.h> |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index f7b61687bd79..5cb738a18ca3 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <asm/vmx.h> | 40 | #include <asm/vmx.h> |
41 | #include <asm/virtext.h> | 41 | #include <asm/virtext.h> |
42 | #include <asm/mce.h> | 42 | #include <asm/mce.h> |
43 | #include <asm/i387.h> | 43 | #include <asm/fpu/api.h> |
44 | #include <asm/xcr.h> | 44 | #include <asm/xcr.h> |
45 | #include <asm/perf_event.h> | 45 | #include <asm/perf_event.h> |
46 | #include <asm/debugreg.h> | 46 | #include <asm/debugreg.h> |
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index 8f9a133cc099..27f8eea0d6eb 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -70,7 +70,7 @@ | |||
70 | #include <asm/e820.h> | 70 | #include <asm/e820.h> |
71 | #include <asm/mce.h> | 71 | #include <asm/mce.h> |
72 | #include <asm/io.h> | 72 | #include <asm/io.h> |
73 | #include <asm/i387.h> | 73 | #include <asm/fpu/api.h> |
74 | #include <asm/stackprotector.h> | 74 | #include <asm/stackprotector.h> |
75 | #include <asm/reboot.h> /* for struct machine_ops */ | 75 | #include <asm/reboot.h> /* for struct machine_ops */ |
76 | #include <asm/kvm_para.h> | 76 | #include <asm/kvm_para.h> |
diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c index c9f2d9ba8dd8..e5e3ed8dc079 100644 --- a/arch/x86/lib/mmx_32.c +++ b/arch/x86/lib/mmx_32.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
23 | #include <linux/types.h> | 23 | #include <linux/types.h> |
24 | 24 | ||
25 | #include <asm/i387.h> | 25 | #include <asm/fpu/api.h> |
26 | #include <asm/asm.h> | 26 | #include <asm/asm.h> |
27 | 27 | ||
28 | void *_mmx_memcpy(void *to, const void *from, size_t len) | 28 | void *_mmx_memcpy(void *to, const void *from, size_t len) |
diff --git a/arch/x86/math-emu/fpu_entry.c b/arch/x86/math-emu/fpu_entry.c index e394bcb4275d..3bb4c6a24ea5 100644 --- a/arch/x86/math-emu/fpu_entry.c +++ b/arch/x86/math-emu/fpu_entry.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <asm/traps.h> | 31 | #include <asm/traps.h> |
32 | #include <asm/desc.h> | 32 | #include <asm/desc.h> |
33 | #include <asm/user.h> | 33 | #include <asm/user.h> |
34 | #include <asm/i387.h> | 34 | #include <asm/fpu/api.h> |
35 | 35 | ||
36 | #include "fpu_system.h" | 36 | #include "fpu_system.h" |
37 | #include "fpu_emu.h" | 37 | #include "fpu_emu.h" |
diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c index a3bebef255ad..0c98a9d51a24 100644 --- a/drivers/char/hw_random/via-rng.c +++ b/drivers/char/hw_random/via-rng.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <asm/io.h> | 33 | #include <asm/io.h> |
34 | #include <asm/msr.h> | 34 | #include <asm/msr.h> |
35 | #include <asm/cpufeature.h> | 35 | #include <asm/cpufeature.h> |
36 | #include <asm/i387.h> | 36 | #include <asm/fpu/api.h> |
37 | 37 | ||
38 | 38 | ||
39 | 39 | ||
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index c178ed8c3908..da2d6777bd09 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <asm/cpu_device_id.h> | 22 | #include <asm/cpu_device_id.h> |
23 | #include <asm/byteorder.h> | 23 | #include <asm/byteorder.h> |
24 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |
25 | #include <asm/i387.h> | 25 | #include <asm/fpu/api.h> |
26 | 26 | ||
27 | /* | 27 | /* |
28 | * Number of data blocks actually fetched for each xcrypt insn. | 28 | * Number of data blocks actually fetched for each xcrypt insn. |
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c index 95f7d27ce491..4e154c9b9206 100644 --- a/drivers/crypto/padlock-sha.c +++ b/drivers/crypto/padlock-sha.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
24 | #include <linux/scatterlist.h> | 24 | #include <linux/scatterlist.h> |
25 | #include <asm/cpu_device_id.h> | 25 | #include <asm/cpu_device_id.h> |
26 | #include <asm/i387.h> | 26 | #include <asm/fpu/api.h> |
27 | 27 | ||
28 | struct padlock_sha_desc { | 28 | struct padlock_sha_desc { |
29 | struct shash_desc fallback; | 29 | struct shash_desc fallback; |
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c index bcb534a5512d..fce5989e66d9 100644 --- a/drivers/lguest/x86/core.c +++ b/drivers/lguest/x86/core.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include <asm/setup.h> | 46 | #include <asm/setup.h> |
47 | #include <asm/lguest.h> | 47 | #include <asm/lguest.h> |
48 | #include <asm/uaccess.h> | 48 | #include <asm/uaccess.h> |
49 | #include <asm/i387.h> | 49 | #include <asm/fpu/api.h> |
50 | #include <asm/tlbflush.h> | 50 | #include <asm/tlbflush.h> |
51 | #include "../lg.h" | 51 | #include "../lg.h" |
52 | 52 | ||
diff --git a/lib/raid6/x86.h b/lib/raid6/x86.h index b7595484a815..8fe9d9662abb 100644 --- a/lib/raid6/x86.h +++ b/lib/raid6/x86.h | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | #ifdef __KERNEL__ /* Real code */ | 24 | #ifdef __KERNEL__ /* Real code */ |
25 | 25 | ||
26 | #include <asm/i387.h> | 26 | #include <asm/fpu/api.h> |
27 | 27 | ||
28 | #else /* Dummy code for user space testing */ | 28 | #else /* Dummy code for user space testing */ |
29 | 29 | ||