diff options
Diffstat (limited to 'debian/patches-rt/0106-printk-remove-deferred-printing.patch')
| -rw-r--r-- | debian/patches-rt/0106-printk-remove-deferred-printing.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/debian/patches-rt/0106-printk-remove-deferred-printing.patch b/debian/patches-rt/0106-printk-remove-deferred-printing.patch index b65397f57..07a20b1ac 100644 --- a/debian/patches-rt/0106-printk-remove-deferred-printing.patch +++ b/debian/patches-rt/0106-printk-remove-deferred-printing.patch @@ -1,8 +1,8 @@ -From f1e8f72e9d5c1df1ddaac09999645f7255219d77 Mon Sep 17 00:00:00 2001 +From c8f5e3ab356f317ec8d6e6fd4d99d4224c3d4718 Mon Sep 17 00:00:00 2001 From: John Ogness <john.ogness@linutronix.de> Date: Mon, 30 Nov 2020 01:42:08 +0106 Subject: [PATCH 106/323] printk: remove deferred printing -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 Since printing occurs either atomically or from the printing kthread, there is no need for any deferring or tracking possible @@ -25,7 +25,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> delete mode 100644 kernel/printk/printk_safe.c diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c -index 8aa7fa949c23..3693706ba0a1 100644 +index 8aa7fa949c232..3693706ba0a1a 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -671,9 +671,7 @@ static void do_handle_IPI(int ipinr) @@ -39,7 +39,7 @@ index 8aa7fa949c23..3693706ba0a1 100644 default: diff --git a/arch/powerpc/kexec/crash.c b/arch/powerpc/kexec/crash.c -index c9a889880214..d488311efab1 100644 +index c9a889880214e..d488311efab1f 100644 --- a/arch/powerpc/kexec/crash.c +++ b/arch/powerpc/kexec/crash.c @@ -311,9 +311,6 @@ void default_machine_crash_shutdown(struct pt_regs *regs) @@ -53,7 +53,7 @@ index c9a889880214..d488311efab1 100644 * This function is only called after the system * has panicked or is otherwise in a critical state. diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h -index 754f67ac4326..c35b71f8644a 100644 +index 754f67ac4326a..c35b71f8644aa 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h @@ -115,7 +115,6 @@ extern void rcu_nmi_exit(void); @@ -73,7 +73,7 @@ index 754f67ac4326..c35b71f8644a 100644 lockdep_on(); \ } while (0) diff --git a/include/linux/printk.h b/include/linux/printk.h -index 3738374e2b3b..410435ac15ea 100644 +index 3738374e2b3bc..410435ac15ea1 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -155,18 +155,6 @@ static inline __printf(1, 2) __cold @@ -96,7 +96,7 @@ index 3738374e2b3b..410435ac15ea 100644 #ifdef CONFIG_PRINTK diff --git a/kernel/printk/Makefile b/kernel/printk/Makefile -index eee3dc9b60a9..59cb24e25f00 100644 +index eee3dc9b60a9a..59cb24e25f004 100644 --- a/kernel/printk/Makefile +++ b/kernel/printk/Makefile @@ -1,5 +1,4 @@ @@ -107,7 +107,7 @@ index eee3dc9b60a9..59cb24e25f00 100644 obj-$(CONFIG_PRINTK) += printk_ringbuffer.o diff --git a/kernel/printk/internal.h b/kernel/printk/internal.h deleted file mode 100644 -index e108b2ece8c7..000000000000 +index e108b2ece8c70..0000000000000 --- a/kernel/printk/internal.h +++ /dev/null @@ -1,70 +0,0 @@ @@ -182,7 +182,7 @@ index e108b2ece8c7..000000000000 -static inline bool printk_percpu_data_ready(void) { return false; } -#endif /* CONFIG_PRINTK */ diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index 232ce58e94c2..2b110b9ae34a 100644 +index 2dc54d08cd8bc..d7b3cd47339a9 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -45,6 +45,7 @@ @@ -291,7 +291,7 @@ index 232ce58e94c2..2b110b9ae34a 100644 asmlinkage int vprintk(const char *fmt, va_list args) { -@@ -3078,18 +3072,10 @@ void wake_up_klogd(void) +@@ -3101,18 +3095,10 @@ void wake_up_klogd(void) preempt_enable(); } @@ -315,7 +315,7 @@ index 232ce58e94c2..2b110b9ae34a 100644 int printk_deferred(const char *fmt, ...) diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c deleted file mode 100644 -index c23b127a6545..000000000000 +index c23b127a65459..0000000000000 --- a/kernel/printk/printk_safe.c +++ /dev/null @@ -1,88 +0,0 @@ @@ -408,10 +408,10 @@ index c23b127a6545..000000000000 - return vprintk_default(fmt, args); -} diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index 70ab6b46ef8f..5d6730589823 100644 +index db3b3b2455894..aa1da411d181b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c -@@ -9517,7 +9517,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) +@@ -9537,7 +9537,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) tracing_off(); local_irq_save(flags); @@ -419,7 +419,7 @@ index 70ab6b46ef8f..5d6730589823 100644 /* Simulate the iterator */ trace_init_global_iter(&iter); -@@ -9594,7 +9593,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) +@@ -9614,7 +9613,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) atomic_dec(&per_cpu_ptr(iter.array_buffer->data, cpu)->disabled); } atomic_dec(&dump_running); @@ -428,5 +428,5 @@ index 70ab6b46ef8f..5d6730589823 100644 } EXPORT_SYMBOL_GPL(ftrace_dump); -- -2.43.0 +2.44.0 |