From: tip-bot for Jiri Kosina <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: jkosina@suse.cz, keescook@chromium.org,
linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
tglx@linutronix.de, hpa@linux.intel.com, bp@suse.de,
fengguang.wu@intel.com
Subject: [tip:x86/urgent] x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch
Date: Fri, 20 Feb 2015 02:31:37 -0800 [thread overview]
Message-ID: <tip-570e1aa84c376ff39809442f09c7606ddf62cfd1@git.kernel.org> (raw)
In-Reply-To: <alpine.LNX.2.00.1502201017240.28769@pobox.suse.cz>
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, ...) \
prev parent reply other threads:[~2015-02-20 10:31 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 ` [PATCH] x86/mm/ASLR: avoid " Jiri Kosina
2015-02-20 10:31 ` tip-bot for Jiri Kosina [this message]
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=tip-570e1aa84c376ff39809442f09c7606ddf62cfd1@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=fengguang.wu@intel.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jkosina@suse.cz \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome