1 files changed, 43 insertions, 12 deletions

diff --git a/kernel/printk.c b/kernel/printk.c
index 0bbdeac2810c..051d27e36a6c 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -449,13 +449,16 @@ static int printk_time = 1;
 #else
 static int printk_time = 0;
 #endif
-module_param(printk_time, int, S_IRUGO | S_IWUSR);
+module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR);
 
 static int __init printk_time_setup(char *str)
 {
         if (*str)
                 return 0;
         printk_time = 1;
+        printk(KERN_NOTICE "The 'time' option is deprecated and "
+                "is scheduled for removal in early 2008\n");
+        printk(KERN_NOTICE "Use 'printk.time=<value>' instead\n");
         return 1;
 }
 
@@ -483,6 +486,9 @@ static int have_callable_console(void)
  * @fmt: format string
  *
  * This is printk().  It can be called from any context.  We want it to work.
+ * Be aware of the fact that if oops_in_progress is not set, we might try to
+ * wake klogd up which could deadlock on runqueue lock if printk() is called
+ * from scheduler code.
  *
  * We try to grab the console_sem.  If we succeed, it's easy - we log the output and
  * call the console drivers.  If we fail to get the semaphore we place the output
@@ -654,7 +660,7 @@ static void call_console_drivers(unsigned long start, unsigned long end)
  */
 static int __init console_setup(char *str)
 {
-        char name[sizeof(console_cmdline[0].name)];
+        char buf[sizeof(console_cmdline[0].name) + 4]; /* 4 for index */
         char *s, *options;
         int idx;
 
@@ -662,27 +668,27 @@ static int __init console_setup(char *str)
          * Decode str into name, index, options.
          */
         if (str[0] >= '0' && str[0] <= '9') {
-                strcpy(name, "ttyS");
-                strncpy(name + 4, str, sizeof(name) - 5);
+                strcpy(buf, "ttyS");
+                strncpy(buf + 4, str, sizeof(buf) - 5);
         } else {
-                strncpy(name, str, sizeof(name) - 1);
+                strncpy(buf, str, sizeof(buf) - 1);
         }
-        name[sizeof(name) - 1] = 0;
+        buf[sizeof(buf) - 1] = 0;
         if ((options = strchr(str, ',')) != NULL)
                 *(options++) = 0;
 #ifdef __sparc__
         if (!strcmp(str, "ttya"))
-                strcpy(name, "ttyS0");
+                strcpy(buf, "ttyS0");
         if (!strcmp(str, "ttyb"))
-                strcpy(name, "ttyS1");
+                strcpy(buf, "ttyS1");
 #endif
-        for (s = name; *s; s++)
+        for (s = buf; *s; s++)
                 if ((*s >= '0' && *s <= '9') || *s == ',')
                         break;
         idx = simple_strtoul(s, NULL, 10);
         *s = 0;
 
-        add_preferred_console(name, idx, options);
+        add_preferred_console(buf, idx, options);
         return 1;
 }
 __setup("console=", console_setup);
@@ -709,7 +715,7 @@ int __init add_preferred_console(char *name, int idx, char *options)
          *      See if this tty is not yet registered, and
          *      if we have a slot free.
          */
-        for(i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; i++)
+        for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; i++)
                 if (strcmp(console_cmdline[i].name, name) == 0 &&
                           console_cmdline[i].index == idx) {
                                 selected_console = i;
@@ -726,6 +732,25 @@ int __init add_preferred_console(char *name, int idx, char *options)
         return 0;
 }
 
+int __init update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
+{
+        struct console_cmdline *c;
+        int i;
+
+        for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0]; i++)
+                if (strcmp(console_cmdline[i].name, name) == 0 &&
+                          console_cmdline[i].index == idx) {
+                                c = &console_cmdline[i];
+                                memcpy(c->name, name_new, sizeof(c->name));
+                                c->name[sizeof(c->name) - 1] = 0;
+                                c->options = options;
+                                c->index = idx_new;
+                                return i;
+                }
+        /* not found */
+        return -1;
+}
+
 #ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
 /**
  * suspend_console - suspend the console subsystem
@@ -942,6 +967,9 @@ void register_console(struct console *console)
         if (preferred_console < 0 || bootconsole || !console_drivers)
                 preferred_console = selected_console;
 
+        if (console->early_setup)
+                console->early_setup();
+
         /*
          *      See if we want to use this console driver. If we
          *      didn't select a console we take the first one
@@ -985,12 +1013,15 @@ void register_console(struct console *console)
         if (!(console->flags & CON_ENABLED))
                 return;
 
-        if (bootconsole) {
+        if (bootconsole && (console->flags & CON_CONSDEV)) {
                 printk(KERN_INFO "console handover: boot [%s%d] -> real [%s%d]\n",
                        bootconsole->name, bootconsole->index,
                        console->name, console->index);
                 unregister_console(bootconsole);
                 console->flags &= ~CON_PRINTBUFFER;
+        } else {
+                printk(KERN_INFO "console [%s%d] enabled\n",
+                       console->name, console->index);
         }
 
         /*