Messages in this thread Patch in this message | | | Date | Fri, 20 Feb 2015 02:31:37 -0800 | From | tip-bot for Jiri Kosina <> | Subject | [tip:x86/urgent] x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch |
| |
Commit-ID: 570e1aa84c376ff39809442f09c7606ddf62cfd1 Gitweb: http://git.kernel.org/tip/570e1aa84c376ff39809442f09c7606ddf62cfd1 Author: Jiri Kosina <jkosina@suse.cz> AuthorDate: Fri, 20 Feb 2015 10:18:59 +0100 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Fri, 20 Feb 2015 10:55:32 +0100
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> --- arch/x86/include/asm/page_types.h | 1 - arch/x86/kernel/module.c | 1 - 2 files changed, 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, ...) \
| |