diff --git a/[refs] b/[refs] index 5ccd22d6579c..c557c3d9528b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fcce7432a731e67f1cd3ef1e71dca9ea84dedb1 +refs/heads/master: 256a6b41365e17cebe5c2fc91ddff716c9aa055a diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 771f5e861bcd..f7d427ef5038 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -820,15 +820,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)) { - /* - * If we printk from within the lock dependency code, - * from within the scheduler code, then do not lock - * up due to self-recursion: - */ - if (!lockdep_internal()) - wake_up_interruptible(&log_wait); - } + if (wake_klogd && !oops_in_progress && waitqueue_active(&log_wait)) + wake_up_interruptible(&log_wait); } EXPORT_SYMBOL(release_console_sem);