diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 12:03:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 12:03:57 -0800 |
commit | 2a0fede97fd52a5c9789d1d54ebd3b46878151c3 (patch) | |
tree | a0a1f5bdc25491414df20ff90785ca14e3929cc3 /arch/x86/realmode/rm | |
parent | 06bc0f4a2e7fe54d98539686f070ceccfd73953d (diff) | |
parent | d139336700a5f3a560da235e4dfcd286773025d4 (diff) | |
download | op-kernel-dev-2a0fede97fd52a5c9789d1d54ebd3b46878151c3.zip op-kernel-dev-2a0fede97fd52a5c9789d1d54ebd3b46878151c3.tar.gz |
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, cpu, amd: Fix a shadowed variable situation
um, x86: Fix vDSO build
x86: Delete non-required instances of include <linux/init.h>
x86, realmode: Pointer walk cleanups, pull out invariant use of __pa()
x86/traps: Clean up error exception handler definitions
Diffstat (limited to 'arch/x86/realmode/rm')
-rw-r--r-- | arch/x86/realmode/rm/reboot.S | 1 | ||||
-rw-r--r-- | arch/x86/realmode/rm/trampoline_32.S | 1 | ||||
-rw-r--r-- | arch/x86/realmode/rm/trampoline_64.S | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S index f932ea6..d66c607 100644 --- a/arch/x86/realmode/rm/reboot.S +++ b/arch/x86/realmode/rm/reboot.S @@ -1,5 +1,4 @@ #include <linux/linkage.h> -#include <linux/init.h> #include <asm/segment.h> #include <asm/page_types.h> #include <asm/processor-flags.h> diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S index c1b2791..48ddd76 100644 --- a/arch/x86/realmode/rm/trampoline_32.S +++ b/arch/x86/realmode/rm/trampoline_32.S @@ -20,7 +20,6 @@ */ #include <linux/linkage.h> -#include <linux/init.h> #include <asm/segment.h> #include <asm/page_types.h> #include "realmode.h" diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S index bb360dc..dac7b20 100644 --- a/arch/x86/realmode/rm/trampoline_64.S +++ b/arch/x86/realmode/rm/trampoline_64.S @@ -25,7 +25,6 @@ */ #include <linux/linkage.h> -#include <linux/init.h> #include <asm/pgtable_types.h> #include <asm/page_types.h> #include <asm/msr.h> |