From 929151f7a91a4f34d77d5de28e142c5c36287f0e Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Sun, 13 Jan 2013 20:36:39 -0800
Subject: [PATCH] --- yaml --- r: 348815 b: refs/heads/master c:
 ab3cd8670e0b3fcde7f029e1503ed3c5138e9571 h: refs/heads/master i:   348813:
 a18575a5c7522b59d25c96fc3ad2141f7b640466   348811:
 3f9c9ab345682ff7fc27e4324dd1da89d310ebc0   348807:
 f7c1c2a643a515d66418447aeda0ece403d5c1aa   348799:
 4b0bd8cdc37f98247b775c8209a9d49163c23890 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/setup.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d54f68c180be..0d9d9b76d102 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9acc5365dbda29f7be2884efb63771dc24bd815
+refs/heads/master: ab3cd8670e0b3fcde7f029e1503ed3c5138e9571
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 9dcb32545032..18182d19b71b 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/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,