summaryrefslogtreecommitdiff
path: root/patches/printk-kill.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/printk-kill.patch')
-rw-r--r--patches/printk-kill.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/printk-kill.patch b/patches/printk-kill.patch
index 375e9d2dcc40..ae24fc0f978b 100644
--- a/patches/printk-kill.patch
+++ b/patches/printk-kill.patch
@@ -87,9 +87,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
#ifdef CONFIG_PRINTK
DECLARE_WAIT_QUEUE_HEAD(log_wait);
/* the next printk record to read by syslog(READ) or /proc/kmsg */
-@@ -1836,6 +1888,13 @@ asmlinkage int vprintk_emit(int facility
- int printed_len;
+@@ -1886,6 +1938,13 @@ asmlinkage int vprintk_emit(int facility
bool in_sched = false;
+ unsigned long flags;
+ /*
+ * Fall back to early_printk if a debugging subsystem has
@@ -101,7 +101,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
if (level == LOGLEVEL_SCHED) {
level = LOGLEVEL_DEFAULT;
in_sched = true;
-@@ -2017,26 +2076,6 @@ static bool suppress_message_printing(in
+@@ -2026,26 +2085,6 @@ static bool suppress_message_printing(in
#endif /* CONFIG_PRINTK */