|
@@ -120,7 +120,7 @@ static __init void early_serial_init(char *s)
|
|
if (!strncmp(s, "0x", 2)) {
|
|
if (!strncmp(s, "0x", 2)) {
|
|
early_serial_base = simple_strtoul(s, &e, 16);
|
|
early_serial_base = simple_strtoul(s, &e, 16);
|
|
} else {
|
|
} else {
|
|
- static int bases[] = { 0x3f8, 0x2f8 };
|
|
|
|
|
|
+ static const int __initconst bases[] = { 0x3f8, 0x2f8 };
|
|
|
|
|
|
if (!strncmp(s, "ttyS", 4))
|
|
if (!strncmp(s, "ttyS", 4))
|
|
s += 4;
|
|
s += 4;
|
|
@@ -920,7 +920,7 @@ static struct console simnow_console = {
|
|
|
|
|
|
/* Direct interface for emergencies */
|
|
/* Direct interface for emergencies */
|
|
static struct console *early_console = &early_vga_console;
|
|
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, ...)
|
|
asmlinkage void early_printk(const char *fmt, ...)
|
|
{
|
|
{
|