summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2008-08-29 12:49:55 +0100
committerIngo Molnar <mingo@elte.hu>2008-09-06 19:41:31 +0200
commit30cec97967beb5aa08e893e8ff69623d5fecd9b7 (patch)
treeaa138ebaacc132201e3172a363752959b9edd8cf
parent467cd0529a480c9c25f06154b788d1d1ba77828a (diff)
downloadlinux-30cec97967beb5aa08e893e8ff69623d5fecd9b7.tar.gz
linux-30cec97967beb5aa08e893e8ff69623d5fecd9b7.tar.bz2
linux-30cec97967beb5aa08e893e8ff69623d5fecd9b7.zip
x86: init annotations in early_printk() setup
Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/early_printk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 825e9136b026..02fc5b40c14b 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, ...)
{