|
@@ -1907,6 +1907,7 @@ asmlinkage int vprintk_emit(int facility, int level,
|
|
|
preempt_enable();
|
|
|
}
|
|
|
|
|
|
+ wake_up_klogd();
|
|
|
return printed_len;
|
|
|
}
|
|
|
EXPORT_SYMBOL(vprintk_emit);
|
|
@@ -2288,9 +2289,7 @@ void console_unlock(void)
|
|
|
{
|
|
|
static char ext_text[CONSOLE_EXT_LOG_MAX];
|
|
|
static char text[LOG_LINE_MAX + PREFIX_MAX];
|
|
|
- static u64 seen_seq;
|
|
|
unsigned long flags;
|
|
|
- bool wake_klogd = false;
|
|
|
bool do_cond_resched, retry;
|
|
|
|
|
|
if (console_suspended) {
|
|
@@ -2334,11 +2333,6 @@ again:
|
|
|
|
|
|
printk_safe_enter_irqsave(flags);
|
|
|
raw_spin_lock(&logbuf_lock);
|
|
|
- if (seen_seq != log_next_seq) {
|
|
|
- wake_klogd = true;
|
|
|
- seen_seq = log_next_seq;
|
|
|
- }
|
|
|
-
|
|
|
if (console_seq < log_first_seq) {
|
|
|
len = sprintf(text, "** %u printk messages dropped **\n",
|
|
|
(unsigned)(log_first_seq - console_seq));
|
|
@@ -2396,7 +2390,7 @@ skip:
|
|
|
|
|
|
if (console_lock_spinning_disable_and_check()) {
|
|
|
printk_safe_exit_irqrestore(flags);
|
|
|
- goto out;
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
printk_safe_exit_irqrestore(flags);
|
|
@@ -2428,10 +2422,6 @@ skip:
|
|
|
|
|
|
if (retry && console_trylock())
|
|
|
goto again;
|
|
|
-
|
|
|
-out:
|
|
|
- if (wake_klogd)
|
|
|
- wake_up_klogd();
|
|
|
}
|
|
|
EXPORT_SYMBOL(console_unlock);
|
|
|
|