[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <48B7FE83.76E4.0078.0@novell.com>
Date: Fri, 29 Aug 2008 12:49:55 +0100
From: "Jan Beulich" <jbeulich@...ell.com>
To: <mingo@...e.hu>, <tglx@...utronix.de>, <hpa@...or.com>
Cc: <linux-kernel@...r.kernel.org>
Subject: [PATCH] x86: init annotations in early_printk() setup
Signed-off-by: Jan Beulich <jbeulich@...ell.com>
---
arch/x86/kernel/early_printk.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-2.6.27-rc5/arch/x86/kernel/early_printk.c 2008-08-21 14:37:29.000000000 +0200
+++ 2.6.27-rc5-x86-early-printk-init/arch/x86/kernel/early_printk.c 2008-08-22 15:24:33.000000000 +0200
@@ -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, ...)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists