diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 12:41:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 12:41:22 -0400 |
| commit | 35cb8d9e18c0bb33b90d7e574abadbe23b65427d (patch) | |
| tree | 7bf2ce00ce1203a54ad5ace4f707a10f4fe0b14b /arch/x86/kernel/process_64.c | |
| parent | 02c502566ef505d0469fa27567f48766c1f5f7af (diff) | |
| parent | 1361b83a13d4d92e53fbb6c877528713e118b821 (diff) | |
Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/fpu changes from Ingo Molnar.
* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
i387: Split up <asm/i387.h> into exported and internal interfaces
i387: Uninline the generic FP helpers that we expose to kernel modules
Diffstat (limited to 'arch/x86/kernel/process_64.c')
| -rw-r--r-- | arch/x86/kernel/process_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 442e7bfe10ae..292da13fc5aa 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <asm/system.h> | 43 | #include <asm/system.h> |
| 44 | #include <asm/processor.h> | 44 | #include <asm/processor.h> |
| 45 | #include <asm/i387.h> | 45 | #include <asm/i387.h> |
| 46 | #include <asm/fpu-internal.h> | ||
| 46 | #include <asm/mmu_context.h> | 47 | #include <asm/mmu_context.h> |
| 47 | #include <asm/prctl.h> | 48 | #include <asm/prctl.h> |
| 48 | #include <asm/desc.h> | 49 | #include <asm/desc.h> |