--- zzzz-none-000/linux-2.4.17/kernel/printk.c 2001-12-21 17:42:04.000000000 +0000 +++ sangam-fb-322/linux-2.4.17/kernel/printk.c 2004-11-24 13:21:27.000000000 +0000 @@ -33,7 +33,7 @@ #elif defined(CONFIG_SMP) #define LOG_BUF_LEN (32768) #else -#define LOG_BUF_LEN (16384) /* This must be a power of two */ +#define LOG_BUF_LEN (1024) /* This must be a power of two */ #endif #define LOG_BUF_MASK (LOG_BUF_LEN-1) @@ -95,7 +95,11 @@ /* * Setup a list of consoles. Called from init/main.c */ +#if defined(CONFIG_MIPS_AVALANCHE_SOC) +int __init console_setup(char *str) +#else static int __init console_setup(char *str) +#endif /* CONFIG_MIPS_AVALANCHE_SOC */ { struct console_cmdline *c; char name[sizeof(c->name)]; @@ -591,16 +595,19 @@ * the command line. */ for(i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; i++) { - if (strcmp(console_cmdline[i].name, console->name) != 0) + if (strcmp(console_cmdline[i].name, console->name) != 0) { continue; + } if (console->index >= 0 && - console->index != console_cmdline[i].index) + console->index != console_cmdline[i].index) { continue; + } if (console->index < 0) console->index = console_cmdline[i].index; if (console->setup && - console->setup(console, console_cmdline[i].options) != 0) + console->setup(console, console_cmdline[i].options) != 0) { break; + } console->flags |= CON_ENABLED; console->index = console_cmdline[i].index; if (i == preferred_console) @@ -608,8 +615,9 @@ break; } - if (!(console->flags & CON_ENABLED)) + if (!(console->flags & CON_ENABLED)) { return; + } /* * Put this console in the list - keep the