]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: init annotations in early_printk() setup
authorJan Beulich <jbeulich@novell.com>
Fri, 29 Aug 2008 11:49:55 +0000 (12:49 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 17:41:31 +0000 (19:41 +0200)
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/early_printk.c

index 825e9136b026b07984f6722aadd0bc506c37148e..02fc5b40c14b7f9bb6d9a0cef735d0535780df49 100644 (file)
@@ -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, ...)
 {