summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0107-printk-add-console-handover.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0107-printk-add-console-handover.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0107-printk-add-console-handover.patch b/debian/patches-rt/0107-printk-add-console-handover.patch
index 9abc4efd5..23d9e6308 100644
--- a/debian/patches-rt/0107-printk-add-console-handover.patch
+++ b/debian/patches-rt/0107-printk-add-console-handover.patch
@@ -1,8 +1,8 @@
-From ead093d95a7917fa12f9d4653032eac383d21c1d Mon Sep 17 00:00:00 2001
+From 4249c8607121d5aba27b7ba1141ca3ee2fda334d Mon Sep 17 00:00:00 2001
From: John Ogness <john.ogness@linutronix.de>
Date: Mon, 30 Nov 2020 01:42:09 +0106
Subject: [PATCH 107/323] printk: add console handover
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
If earlyprintk is used, a boot console will print directly to the
console immediately. The boot console will unregister itself as soon
@@ -26,7 +26,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/linux/console.h b/include/linux/console.h
-index 3e99359e0660..027278792eea 100644
+index 3e99359e06602..027278792eea4 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -138,6 +138,7 @@ static inline int con_debug_leave(void)
@@ -38,7 +38,7 @@ index 3e99359e0660..027278792eea 100644
struct console {
char name[16];
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index 2b110b9ae34a..58da007d7c99 100644
+index d7b3cd47339a9..0cc452e7b1a1c 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1729,6 +1729,8 @@ static bool console_can_sync(struct console *con)
@@ -59,7 +59,7 @@ index 2b110b9ae34a..58da007d7c99 100644
else if (con->write && (con->flags & CON_BOOT) && !con->thread)
con->write(con, text, text_len);
else
-@@ -2832,8 +2836,10 @@ void register_console(struct console *newcon)
+@@ -2855,8 +2859,10 @@ void register_console(struct console *newcon)
* the real console are the same physical device, it's annoying to
* see the beginning boot messages twice
*/
@@ -72,5 +72,5 @@ index 2b110b9ae34a..58da007d7c99 100644
/*
* Put this console in the list - keep the
--
-2.43.0
+2.44.0