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/vdso | |
| parent | 06bc0f4a2e7fe54d98539686f070ceccfd73953d (diff) | |
| parent | d139336700a5f3a560da235e4dfcd286773025d4 (diff) | |
| download | linux-2a0fede97fd52a5c9789d1d54ebd3b46878151c3.tar.gz linux-2a0fede97fd52a5c9789d1d54ebd3b46878151c3.tar.bz2 linux-2a0fede97fd52a5c9789d1d54ebd3b46878151c3.zip | |
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/vdso')
| -rw-r--r-- | arch/x86/vdso/vdso.S | 1 | ||||
| -rw-r--r-- | arch/x86/vdso/vdsox32.S | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S index 01f5e3b4613c..1e13eb8c9656 100644 --- a/arch/x86/vdso/vdso.S +++ b/arch/x86/vdso/vdso.S @@ -1,6 +1,5 @@ #include <asm/page_types.h> #include <linux/linkage.h> -#include <linux/init.h> __PAGE_ALIGNED_DATA diff --git a/arch/x86/vdso/vdsox32.S b/arch/x86/vdso/vdsox32.S index d6b9a7f42a8a..295f1c7543d8 100644 --- a/arch/x86/vdso/vdsox32.S +++ b/arch/x86/vdso/vdsox32.S @@ -1,6 +1,5 @@ #include <asm/page_types.h> #include <linux/linkage.h> -#include <linux/init.h> __PAGE_ALIGNED_DATA |