Skip to contentSkip to conversation

x86: init annotations in early_printk() setup

PATCH Applied Jan Beulich 2 participants 2 messages Aug 29, 2008 – Sep 6, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: init annotations in early_printk() setup

---
 arch/x86/kernel/early_printk.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/early_printk.c +2 -2
@@ -111,7 +111,7 @@ static __init void early_serial_init(cha
 		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;
@@ -194,7 +194,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, ...)
 {
Applied
#1 lore raw
Quoted 5 lines · Jan Beulich
---
 arch/x86/kernel/early_printk.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

applied to tip/x86/early-printk - thanks Jan!

Ingo