diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 13:01:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 13:01:09 -0800 |
| commit | 3ccabd6d9d9b0da5780e0386b4bf7c5f07669e37 (patch) | |
| tree | a9159e4621186178e577a3899f57dece27b986f6 /arch/x86/kernel/setup.c | |
| parent | 5289d3005a36c305a71e6c9187cddf990bdcfc8b (diff) | |
| parent | 782bf20c2a1795f35dcd526aa8005cd1870745da (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Misc cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Remove unused IOMMU_STRESS Kconfig
x86/extable: Mark exception handler functions visible
x86/timer: Don't inline __const_udelay
x86/headers: Remove duplicate #includes
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 68d7ab81c62f..1ae67e982af7 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -114,7 +114,6 @@ #include <asm/alternative.h> #include <asm/prom.h> #include <asm/microcode.h> -#include <asm/mmu_context.h> #include <asm/kaslr.h> #include <asm/unwind.h> |