From: "tip-bot for H. Peter Anvin" <hpa@linux.intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
minipli@googlemail.com, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/urgent] x86/Sandy Bridge: mark arrays in __init functions as __initconst
Date: Sun, 13 Jan 2013 21:11:28 -0800 [thread overview]
Message-ID: <tip-ab3cd8670e0b3fcde7f029e1503ed3c5138e9571@git.kernel.org> (raw)
In-Reply-To: <75F4BEE6-CB0E-4426-B40B-697451677738@googlemail.com>
Commit-ID: ab3cd8670e0b3fcde7f029e1503ed3c5138e9571
Gitweb: http://git.kernel.org/tip/ab3cd8670e0b3fcde7f029e1503ed3c5138e9571
Author: H. Peter Anvin <hpa@linux.intel.com>
AuthorDate: Sun, 13 Jan 2013 20:36:39 -0800
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Sun, 13 Jan 2013 20:36:39 -0800
x86/Sandy Bridge: mark arrays in __init functions as __initconst
Mark static arrays as __initconst so they get removed when the init
sections are flushed.
Reported-by: Mathias Krause <minipli@googlemail.com>
Link: http://lkml.kernel.org/r/75F4BEE6-CB0E-4426-B40B-697451677738@googlemail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/kernel/setup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 9dcb325..18182d1 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -614,7 +614,7 @@ static bool __init snb_gfx_workaround_needed(void)
{
int i;
u16 vendor, devid;
- static const u16 snb_ids[] = {
+ static const __initconst u16 snb_ids[] = {
0x0102,
0x0112,
0x0122,
@@ -646,7 +646,7 @@ static bool __init snb_gfx_workaround_needed(void)
*/
static void __init trim_snb_memory(void)
{
- static const unsigned long bad_pages[] = {
+ static const __initconst unsigned long bad_pages[] = {
0x20050000,
0x20110000,
0x20130000,
prev parent reply other threads:[~2013-01-14 5:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <tip-a9acc5365dbda29f7be2884efb63771dc24bd815@git.kernel.org>
2013-01-11 23:00 ` [tip:x86/urgent] x86/Sandy Bridge: reserve pages when integrated graphics is present Jesse Barnes
2013-01-12 0:08 ` H. Peter Anvin
2013-01-13 20:30 ` Mathias Krause
2013-01-14 5:11 ` tip-bot for H. Peter Anvin [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-ab3cd8670e0b3fcde7f029e1503ed3c5138e9571@git.kernel.org \
--to=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=minipli@googlemail.com \
--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