[PATCH] Extract and use wake_up_klogd()

[linux-2.6.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 3e79e18dce333e2b93542c3c3ae834e465ce270d..4da26b067976d354cf8d757134d5c3e37d2dac5e 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -783,6 +783,12 @@ int is_console_locked(void)
        return console_locked;
 }
 
        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
  *
 /**
  * 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);
        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);
 
 }
 EXPORT_SYMBOL(release_console_sem);