diff options
author | Jan Beulich <jbeulich@novell.com> | 2008-08-29 07:49:55 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 13:41:31 -0400 |
commit | 30cec97967beb5aa08e893e8ff69623d5fecd9b7 (patch) | |
tree | aa138ebaacc132201e3172a363752959b9edd8cf /arch/x86/kernel | |
parent | 467cd0529a480c9c25f06154b788d1d1ba77828a (diff) |
x86: init annotations in early_printk() setup
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/early_printk.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
120 | if (!strncmp(s, "0x", 2)) { | 120 | if (!strncmp(s, "0x", 2)) { |
121 | early_serial_base = simple_strtoul(s, &e, 16); | 121 | early_serial_base = simple_strtoul(s, &e, 16); |
122 | } else { | 122 | } else { |
123 | static int bases[] = { 0x3f8, 0x2f8 }; | 123 | static const int __initconst bases[] = { 0x3f8, 0x2f8 }; |
124 | 124 | ||
125 | if (!strncmp(s, "ttyS", 4)) | 125 | if (!strncmp(s, "ttyS", 4)) |
126 | s += 4; | 126 | s += 4; |
@@ -920,7 +920,7 @@ static struct console simnow_console = { | |||
920 | 920 | ||
921 | /* Direct interface for emergencies */ | 921 | /* Direct interface for emergencies */ |
922 | static struct console *early_console = &early_vga_console; | 922 | static struct console *early_console = &early_vga_console; |
923 | static int early_console_initialized; | 923 | static int __initdata early_console_initialized; |
924 | 924 | ||
925 | asmlinkage void early_printk(const char *fmt, ...) | 925 | asmlinkage void early_printk(const char *fmt, ...) |
926 | { | 926 | { |