All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiri Kosina <jkosina@suse.cz>
To: Borislav Petkov <bp@suse.de>
Cc: linux-kernel@vger.kernel.org,
	kbuild test robot <fengguang.wu@intel.com>,
	Kees Cook <keescook@chromium.org>,
	"H. Peter Anvin" <hpa@linux.intel.com>,
	x86@kernel.org
Subject: [PATCH] x86/mm/ASLR: avoid PAGE_SIZE redefinition for UML subarch
Date: Fri, 20 Feb 2015 10:18:59 +0100 (CET)	[thread overview]
Message-ID: <alpine.LNX.2.00.1502201017240.28769@pobox.suse.cz> (raw)
In-Reply-To: <201502201643.McNsOIpA%fengguang.wu@intel.com>

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

       reply	other threads:[~2015-02-20  9:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <201502201643.McNsOIpA%fengguang.wu@intel.com>
2015-02-20  9:18 ` Jiri Kosina [this message]
2015-02-20 10:31   ` [tip:x86/urgent] x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch tip-bot for Jiri Kosina

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LNX.2.00.1502201017240.28769@pobox.suse.cz \
    --to=jkosina@suse.cz \
    --cc=bp@suse.de \
    --cc=fengguang.wu@intel.com \
    --cc=hpa@linux.intel.com \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.