diff options
Diffstat (limited to 'debian/patches-rt/0009-printk-remove-exclusive-console-hack.patch')
| -rw-r--r-- | debian/patches-rt/0009-printk-remove-exclusive-console-hack.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches-rt/0009-printk-remove-exclusive-console-hack.patch b/debian/patches-rt/0009-printk-remove-exclusive-console-hack.patch index 12aa27ef2..50bd77a81 100644 --- a/debian/patches-rt/0009-printk-remove-exclusive-console-hack.patch +++ b/debian/patches-rt/0009-printk-remove-exclusive-console-hack.patch @@ -1,7 +1,7 @@ From: John Ogness <john.ogness@linutronix.de> Date: Tue, 12 Feb 2019 15:29:47 +0100 Subject: [PATCH 09/25] printk: remove exclusive console hack -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2.17-rt9.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.3-rt1.tar.xz In order to support printing the printk log history when new consoles are registered, a global exclusive_console variable is @@ -21,7 +21,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -259,11 +259,6 @@ static void __up_console_sem(unsigned lo +@@ -269,11 +269,6 @@ static void __up_console_sem(unsigned lo static int console_locked, console_suspended; /* @@ -33,7 +33,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> * Array of consoles built from command line options (console=) */ -@@ -433,7 +428,6 @@ static u32 log_next_idx; +@@ -443,7 +438,6 @@ static u32 log_next_idx; /* the next printk record to write to the console */ static u64 console_seq; static u32 console_idx; @@ -41,7 +41,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* the next printk record to read after the last 'clear' command */ static u64 clear_seq; -@@ -1805,8 +1799,6 @@ static void call_console_drivers(const c +@@ -1815,8 +1809,6 @@ static void call_console_drivers(const c return; for_each_console(con) { @@ -50,7 +50,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (!(con->flags & CON_ENABLED)) continue; if (!con->write) -@@ -2099,7 +2091,6 @@ static u64 syslog_seq; +@@ -2109,7 +2101,6 @@ static u64 syslog_seq; static u32 syslog_idx; static u64 console_seq; static u32 console_idx; @@ -58,7 +58,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static u64 log_first_seq; static u32 log_first_idx; static u64 log_next_seq; -@@ -2468,12 +2459,6 @@ void console_unlock(void) +@@ -2478,12 +2469,6 @@ void console_unlock(void) goto skip; } @@ -71,7 +71,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> len += msg_print_text(msg, console_msg_format & MSG_FORMAT_SYSLOG, printk_time, text + len, sizeof(text) - len); -@@ -2801,17 +2786,6 @@ void register_console(struct console *ne +@@ -2811,17 +2796,6 @@ void register_console(struct console *ne logbuf_lock_irqsave(flags); console_seq = syslog_seq; console_idx = syslog_idx; @@ -89,7 +89,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> logbuf_unlock_irqrestore(flags); } console_unlock(); -@@ -2823,6 +2797,10 @@ void register_console(struct console *ne +@@ -2833,6 +2807,10 @@ void register_console(struct console *ne * boot consoles, real consoles, etc - this is to ensure that end * users know there might be something in the kernel's log buffer that * went to the bootconsole (that they do not see on the real console) |