diff options
author | Salvatore Bonaccorso <carnil@debian.org> | 2019-12-18 18:06:31 +0100 |
---|---|---|
committer | Salvatore Bonaccorso <carnil@debian.org> | 2019-12-18 22:50:21 +0100 |
commit | 102987a83771aa994821d4d982d06faa64c789e4 (patch) | |
tree | 3e5ab5206886ec297a1a97ce80f504d75468ed2f /debian/patches-rt/printk-hack-out-emergency-loglevel-usage.patch | |
parent | 479cb120ecb2b3f2c4d929a7b57860248d6f79bd (diff) | |
download | linux-debian-102987a83771aa994821d4d982d06faa64c789e4.tar.gz |
[rt] Update to 5.4.3-rt1 and re-enable
Adjust for context changes due to backport of
e66b39af00f4 ("workqueue: Fix pwq ref leak in rescuer_thread()") and
def98c84b6cd ("workqueue: Fix spurious sanity check failures in
destroy_workqueue()") in 5.4.4.
Diffstat (limited to 'debian/patches-rt/printk-hack-out-emergency-loglevel-usage.patch')
-rw-r--r-- | debian/patches-rt/printk-hack-out-emergency-loglevel-usage.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/debian/patches-rt/printk-hack-out-emergency-loglevel-usage.patch b/debian/patches-rt/printk-hack-out-emergency-loglevel-usage.patch new file mode 100644 index 000000000..f4e9eda8a --- /dev/null +++ b/debian/patches-rt/printk-hack-out-emergency-loglevel-usage.patch @@ -0,0 +1,53 @@ +From: John Ogness <john.ogness@linutronix.de> +Date: Tue, 3 Dec 2019 09:14:57 +0100 +Subject: [PATCH] printk: hack out emergency loglevel usage +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.3-rt1.tar.xz + +Instead of using an emergency loglevel to determine if atomic +messages should be printed, use oops_in_progress. This conforms +to the decision that latency-causing atomic messages never be +generated during normal operation. + +Signed-off-by: John Ogness <john.ogness@linutronix.de> +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + kernel/printk/printk.c | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c +@@ -1777,15 +1777,8 @@ static void call_console_drivers(u64 seq + con->wrote_history = 1; + con->printk_seq = seq - 1; + } +- if (con->write_atomic && level < emergency_console_loglevel && +- facility == 0) { +- /* skip emergency messages, already printed */ +- if (con->printk_seq < seq) +- con->printk_seq = seq; +- continue; +- } + if (con->flags & CON_BOOT && facility == 0) { +- /* skip emergency messages, already printed */ ++ /* skip boot messages, already printed */ + if (con->printk_seq < seq) + con->printk_seq = seq; + continue; +@@ -3171,7 +3164,7 @@ static bool console_can_emergency(int le + for_each_console(con) { + if (!(con->flags & CON_ENABLED)) + continue; +- if (con->write_atomic && level < emergency_console_loglevel) ++ if (con->write_atomic && oops_in_progress) + return true; + if (con->write && (con->flags & CON_BOOT)) + return true; +@@ -3187,7 +3180,7 @@ static void call_emergency_console_drive + for_each_console(con) { + if (!(con->flags & CON_ENABLED)) + continue; +- if (con->write_atomic && level < emergency_console_loglevel) { ++ if (con->write_atomic && oops_in_progress) { + con->write_atomic(con, text, text_len); + continue; + } |