Skip to content

Commit

Permalink
x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch
Browse files Browse the repository at this point in the history
Commit f47233c ("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>
  • Loading branch information
Jiri Kosina authored and Ingo Molnar committed Feb 20, 2015
1 parent 1fbe23e commit 570e1aa
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion arch/x86/include/asm/page_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/page_types.h>

#if 0
#define DEBUGP(fmt, ...) \
Expand Down

0 comments on commit 570e1aa

Please sign in to comment.