---

yaml --- r: 348815 b: refs/heads/master c: ab3cd86 h: refs/heads/master i: 348813: a18575a 348811: 3f9c9ab 348807: f7c1c2a 348799: 4b0bd8c v: v3
git-mirror · Jan 14, 2013 · 929151f · 929151f
1 parent e9168b0
commit 929151f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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,