[PATCH] x86/mm/ASLR: avoid PAGE_SIZE redefinition for UML subarch

From: Jiri Kosina
Date: Fri Feb 20 2015 - 04:19:18 EST

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@xxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
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, ...) \

Jiri Kosina
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/