From: Jan Beulich <jbeulich@novell.com>
Date: Fri, 29 Aug 2008 11:49:55 +0000 (+0100)
Subject: x86: init annotations in early_printk() setup
X-Git-Tag: v2.6.28-rc1~699^2^7~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=30cec97967beb5aa08e893e8ff69623d5fecd9b7;p=linux-2.6-omap-h63xx.git

x86: init annotations in early_printk() setup

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 825e9136b02..02fc5b40c14 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -120,7 +120,7 @@ static __init void early_serial_init(char *s)
 		if (!strncmp(s, "0x", 2)) {
 			early_serial_base = simple_strtoul(s, &e, 16);
 		} else {
-			static int bases[] = { 0x3f8, 0x2f8 };
+			static const int __initconst bases[] = { 0x3f8, 0x2f8 };
 
 			if (!strncmp(s, "ttyS", 4))
 				s += 4;
@@ -920,7 +920,7 @@ static struct console simnow_console = {
 
 /* Direct interface for emergencies */
 static struct console *early_console = &early_vga_console;
-static int early_console_initialized;
+static int __initdata early_console_initialized;
 
 asmlinkage void early_printk(const char *fmt, ...)
 {