3 files changed, 10 insertions, 11 deletions

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 7e861303cbd..e91dce75bbc 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -176,6 +176,7 @@ static inline void console_verbose(void)
 }
 
 extern void bust_spinlocks(int yes);
+extern void wake_up_klogd(void);
 extern int oops_in_progress;            /* If set, an oops, panic(), BUG() or die() is in progress */
 extern int panic_timeout;
 extern int panic_on_oops;
diff --git a/kernel/printk.c b/kernel/printk.c
index 3e79e18dce3..4da26b06797 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -783,6 +783,12 @@ int is_console_locked(void)
         return console_locked;
 }
 
+void wake_up_klogd(void)
+{
+        if (!oops_in_progress && waitqueue_active(&log_wait))
+                wake_up_interruptible(&log_wait);
+}
+
 /**
  * release_console_sem - unlock the console system
  *
@@ -825,8 +831,8 @@ void release_console_sem(void)
         console_locked = 0;
         up(&console_sem);
         spin_unlock_irqrestore(&logbuf_lock, flags);
-        if (wake_klogd && !oops_in_progress && waitqueue_active(&log_wait))
-                wake_up_interruptible(&log_wait);
+        if (wake_klogd)
+                wake_up_klogd();
 }
 EXPORT_SYMBOL(release_console_sem);
 
diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c
index 0ee968e8e02..accb3565816 100644
--- a/lib/bust_spinlocks.c
+++ b/lib/bust_spinlocks.c
@@ -19,19 +19,11 @@ void __attribute__((weak)) bust_spinlocks(int yes)
         if (yes) {
                 oops_in_progress = 1;
         } else {
-                int loglevel_save = console_loglevel;
 #ifdef CONFIG_VT
                 unblank_screen();
 #endif
                 oops_in_progress = 0;
-                /*
-                 * OK, the message is on the console.  Now we call printk()
-                 * without oops_in_progress set so that printk() will give klogd
-                 * and the blanked console a poke.  Hold onto your hats...
-                 */
-                console_loglevel = 15;          /* NMI oopser may have shut the console up */
-                printk(" ");
-                console_loglevel = loglevel_save;
+                wake_up_klogd();
         }
 }