pandora: defconfig: update

[pandora-kernel.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 7982a0a..c073f43 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -123,7 +123,7 @@ static struct console *exclusive_console;
  */
 struct console_cmdline
 {
-       char    name[8];                        /* Name of the driver       */
+       char    name[16];                       /* Name of the driver       */
        int     index;                          /* Minor dev. to use        */
        char    *options;                       /* Options for the driver   */
 #ifdef CONFIG_A11Y_BRAILLE_CONSOLE
@@ -633,8 +633,19 @@ static void call_console_drivers(unsigned start, unsigned end)
        start_print = start;
        while (cur_index != end) {
                if (msg_level < 0 && ((end - cur_index) > 2)) {
+                       /*
+                        * prepare buf_prefix, as a contiguous array,
+                        * to be processed by log_prefix function
+                        */
+                       char buf_prefix[SYSLOG_PRI_MAX_LENGTH+1];
+                       unsigned i;
+                       for (i = 0; i < ((end - cur_index)) && (i < SYSLOG_PRI_MAX_LENGTH); i++) {
+                               buf_prefix[i] = LOG_BUF(cur_index + i);
+                       }
+                       buf_prefix[i] = '\0'; /* force '\0' as last string character */
+
                        /* strip log prefix */
-                       cur_index += log_prefix(&LOG_BUF(cur_index), &msg_level, NULL);
+                       cur_index += log_prefix((const char *)&buf_prefix, &msg_level, NULL);
                        start_print = cur_index;
                }
                while (cur_index != end) {
@@ -802,9 +813,9 @@ static int console_trylock_for_printk(unsigned int cpu)
                }
        }
        printk_cpu = UINT_MAX;
+       raw_spin_unlock(&logbuf_lock);
        if (wake)
                up(&console_sem);
-       raw_spin_unlock(&logbuf_lock);
        return retval;
 }
 static const char recursion_bug_msg [] =
@@ -1154,7 +1165,6 @@ static int __cpuinit console_cpu_notify(struct notifier_block *self,
        switch (action) {
        case CPU_ONLINE:
        case CPU_DEAD:
-       case CPU_DYING:
        case CPU_DOWN_FAILED:
        case CPU_UP_CANCELED:
                console_lock();
@@ -1467,6 +1477,7 @@ void register_console(struct console *newcon)
         */
        for (i = 0; i < MAX_CMDLINECONSOLES && console_cmdline[i].name[0];
                        i++) {
+               BUILD_BUG_ON(sizeof(console_cmdline[i].name) != sizeof(newcon->name));
                if (strcmp(console_cmdline[i].name, newcon->name) != 0)
                        continue;
                if (newcon->index >= 0 &&