[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-ab3cd8670e0b3fcde7f029e1503ed3c5138e9571@git.kernel.org>
Date: Sun, 13 Jan 2013 21:11:28 -0800
From: "tip-bot for H. Peter Anvin" <hpa@...ux.intel.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
minipli@...glemail.com, tglx@...utronix.de, hpa@...ux.intel.com
Subject: [tip:x86/urgent] x86/Sandy Bridge:
mark arrays in __init functions as __initconst
Commit-ID: ab3cd8670e0b3fcde7f029e1503ed3c5138e9571
Gitweb: http://git.kernel.org/tip/ab3cd8670e0b3fcde7f029e1503ed3c5138e9571
Author: H. Peter Anvin <hpa@...ux.intel.com>
AuthorDate: Sun, 13 Jan 2013 20:36:39 -0800
Committer: H. Peter Anvin <hpa@...ux.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@...glemail.com>
Link: http://lkml.kernel.org/r/75F4BEE6-CB0E-4426-B40B-697451677738@googlemail.com
Signed-off-by: H. Peter Anvin <hpa@...ux.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,
--
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/
Powered by blists - more mailing lists