lkml.org 
[lkml]   [2015]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] 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>
---
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
SUSE Labs


\
 
 \ /
  Last update: 2015-02-20 10:21    [W:0.035 / U:1.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site