All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86/mm/ASLR: avoid PAGE_SIZE redefinition for UML subarch
       [not found] <201502201643.McNsOIpA%fengguang.wu@intel.com>
@ 2015-02-20  9:18 ` Jiri Kosina
  2015-02-20 10:31   ` [tip:x86/urgent] x86/mm/ASLR: Avoid " tip-bot for Jiri Kosina
  0 siblings, 1 reply; 2+ messages in thread
From: Jiri Kosina @ 2015-02-20  9:18 UTC (permalink / raw)
  To: Borislav Petkov
  Cc: linux-kernel, kbuild test robot, Kees Cook, H. Peter Anvin, x86

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [tip:x86/urgent] x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch
  2015-02-20  9:18 ` [PATCH] x86/mm/ASLR: avoid PAGE_SIZE redefinition for UML subarch Jiri Kosina
@ 2015-02-20 10:31   ` tip-bot for Jiri Kosina
  0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Jiri Kosina @ 2015-02-20 10:31 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: jkosina, keescook, linux-kernel, hpa, mingo, tglx, hpa, bp, fengguang.wu

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, ...)				\

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-02-20 10:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <201502201643.McNsOIpA%fengguang.wu@intel.com>
2015-02-20  9:18 ` [PATCH] x86/mm/ASLR: avoid PAGE_SIZE redefinition for UML subarch Jiri Kosina
2015-02-20 10:31   ` [tip:x86/urgent] x86/mm/ASLR: Avoid " tip-bot for Jiri Kosina

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.