diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-02-20 09:18:59 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-20 09:55:32 (GMT) |
| commit | 570e1aa84c376ff39809442f09c7606ddf62cfd1 (patch) | |
| tree | b0728432c0f7d9b2f4a13fa44bda309a11c49349 /arch | |
| parent | 1fbe23e0dea54e30f39f26ae90150ea7ebb48f79 (diff) | |
| download | linux-570e1aa84c376ff39809442f09c7606ddf62cfd1.tar.xz | |
x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch
Commit f47233c2d34 ("x86/mm/ASLR: Propagate base load address
calculation") causes PAGE_SIZE redefinition warnings for UML
subarch builds. This is caused by added includes that were
leftovers from previous patch versions are are not actually
needed (especially page_types.h inlcude in module.c). Drop
those stray includes.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Cc: Borislav Petkov <bp@suse.de>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Kees Cook <keescook@chromium.org>
Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1502201017240.28769@pobox.suse.cz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/page_types.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/module.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h index 3d43ce3..95e11f7 100644 --- a/arch/x86/include/asm/page_types.h +++ b/arch/x86/include/asm/page_types.h @@ -3,7 +3,6 @@ #include <linux/const.h> #include <linux/types.h> -#include <asm/bootparam.h> /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index c3c59a3..ef00116 100644 --- a/arch/x86/kernel/module.c +++ b/arch/x86/kernel/module.c @@ -32,7 +32,6 @@ #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/page_types.h> #if 0 #define DEBUGP(fmt, ...) \ |