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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 20 Feb 2015 10:18:59 +0100 (CET)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Borislav Petkov <bp@...e.de>
cc:	linux-kernel@...r.kernel.org,
	kbuild test robot <fengguang.wu@...el.com>,
	Kees Cook <keescook@...omium.org>,
	"H. Peter Anvin" <hpa@...ux.intel.com>, x86@...nel.org
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@...el.com>
Signed-off-by: Jiri Kosina <jkosina@...e.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/