diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:40:22 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:44:43 +0000 |
commit | b5b67adcc17e3e74dbcda09ff3f8a4636aa53486 (patch) | |
tree | 601c346183757b42c53b1d0aa8773cb00d1bd73c /debian/patches-rt/0006-printk-For-suppress_panic_printk-check-for-other-CPU.patch | |
parent | Merging upstream version 6.7.7. (diff) | |
download | linux-b5b67adcc17e3e74dbcda09ff3f8a4636aa53486.tar.xz linux-b5b67adcc17e3e74dbcda09ff3f8a4636aa53486.zip |
Merging debian version 6.7.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0006-printk-For-suppress_panic_printk-check-for-other-CPU.patch')
-rw-r--r-- | debian/patches-rt/0006-printk-For-suppress_panic_printk-check-for-other-CPU.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches-rt/0006-printk-For-suppress_panic_printk-check-for-other-CPU.patch b/debian/patches-rt/0006-printk-For-suppress_panic_printk-check-for-other-CPU.patch new file mode 100644 index 0000000000..9906aca51f --- /dev/null +++ b/debian/patches-rt/0006-printk-For-suppress_panic_printk-check-for-other-CPU.patch @@ -0,0 +1,34 @@ +From: John Ogness <john.ogness@linutronix.de> +Date: Fri, 13 Oct 2023 20:13:02 +0000 +Subject: [PATCH 06/50] printk: For @suppress_panic_printk check for other CPU + in panic +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz + +Currently @suppress_panic_printk is checked along with +non-matching @panic_cpu and current CPU. This works +because @suppress_panic_printk is only set when +panic_in_progress() is true. + +Rather than relying on the @suppress_panic_printk semantics, +use the concise helper function other_cpu_in_progress(). The +helper function exists to avoid open coding such tests. + +Signed-off-by: John Ogness <john.ogness@linutronix.de> +Reviewed-by: Petr Mladek <pmladek@suse.com> +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + kernel/printk/printk.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c +@@ -2270,8 +2270,7 @@ asmlinkage int vprintk_emit(int facility + if (unlikely(suppress_printk)) + return 0; + +- if (unlikely(suppress_panic_printk) && +- atomic_read(&panic_cpu) != raw_smp_processor_id()) ++ if (unlikely(suppress_panic_printk) && other_cpu_in_panic()) + return 0; + + if (level == LOGLEVEL_SCHED) { |