diff options
Diffstat (limited to 'debian/patches-rt/0092-printk-remove-logbuf_lock.patch')
| -rw-r--r-- | debian/patches-rt/0092-printk-remove-logbuf_lock.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/debian/patches-rt/0092-printk-remove-logbuf_lock.patch b/debian/patches-rt/0092-printk-remove-logbuf_lock.patch index 6f45ee8b3..3f43971e6 100644 --- a/debian/patches-rt/0092-printk-remove-logbuf_lock.patch +++ b/debian/patches-rt/0092-printk-remove-logbuf_lock.patch @@ -1,8 +1,8 @@ -From 74a8c8a0d6b64df822c5946a582ca3adeec24e63 Mon Sep 17 00:00:00 2001 +From 511721a2f6160a32b221debb19e94129cc3f5ce9 Mon Sep 17 00:00:00 2001 From: John Ogness <john.ogness@linutronix.de> Date: Tue, 26 Jan 2021 17:43:19 +0106 Subject: [PATCH 092/323] printk: remove logbuf_lock -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 the ringbuffer is lockless, there is no need for it to be protected by @logbuf_lock. Remove @logbuf_lock. @@ -22,7 +22,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 3 files changed, 48 insertions(+), 103 deletions(-) diff --git a/kernel/printk/internal.h b/kernel/printk/internal.h -index 3a8fd491758c..e7acc2888c8e 100644 +index 3a8fd491758cf..e7acc2888c8e1 100644 --- a/kernel/printk/internal.h +++ b/kernel/printk/internal.h @@ -12,8 +12,6 @@ @@ -44,7 +44,7 @@ index 3a8fd491758c..e7acc2888c8e 100644 * printk-safe must preserve the existing local IRQ guarantees. */ diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index b992be31824f..dde1696d7564 100644 +index cc5f7e0fb1573..9fde03f1e29bf 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -357,41 +357,6 @@ enum log_flags { @@ -282,7 +282,7 @@ index b992be31824f..dde1696d7564 100644 break; /* Size of the log buffer */ case SYSLOG_ACTION_SIZE_BUFFER: -@@ -2630,7 +2596,6 @@ void console_unlock(void) +@@ -2636,7 +2602,6 @@ void console_unlock(void) size_t len; printk_safe_enter_irqsave(flags); @@ -290,7 +290,7 @@ index b992be31824f..dde1696d7564 100644 skip: if (!prb_read_valid(prb, console_seq, &r)) break; -@@ -2674,7 +2639,6 @@ void console_unlock(void) +@@ -2680,7 +2645,6 @@ void console_unlock(void) console_msg_format & MSG_FORMAT_SYSLOG, printk_time); console_seq++; @@ -298,7 +298,7 @@ index b992be31824f..dde1696d7564 100644 /* * While actively printing out messages, if another printk() -@@ -2701,8 +2665,6 @@ void console_unlock(void) +@@ -2707,8 +2671,6 @@ void console_unlock(void) console_locked = 0; @@ -307,7 +307,7 @@ index b992be31824f..dde1696d7564 100644 up_console_sem(); /* -@@ -2711,9 +2673,7 @@ void console_unlock(void) +@@ -2717,9 +2679,7 @@ void console_unlock(void) * there's a new owner and the console_unlock() from them will do the * flush, no worries. */ @@ -317,7 +317,7 @@ index b992be31824f..dde1696d7564 100644 printk_safe_exit_irqrestore(flags); if (retry && console_trylock()) -@@ -2780,9 +2740,9 @@ void console_flush_on_panic(enum con_flush_mode mode) +@@ -2786,9 +2746,9 @@ void console_flush_on_panic(enum con_flush_mode mode) if (mode == CONSOLE_REPLAY_ALL) { unsigned long flags; @@ -329,7 +329,7 @@ index b992be31824f..dde1696d7564 100644 } console_unlock(); } -@@ -3011,7 +2971,7 @@ void register_console(struct console *newcon) +@@ -3040,7 +3000,7 @@ void register_console(struct console *newcon) * console_unlock(); will print out the buffered messages * for us. */ @@ -338,7 +338,7 @@ index b992be31824f..dde1696d7564 100644 /* * We're about to replay the log buffer. Only do this to the * just-registered console to avoid excessive message spam to -@@ -3029,7 +2989,7 @@ void register_console(struct console *newcon) +@@ -3058,7 +3018,7 @@ void register_console(struct console *newcon) console_seq = syslog_seq; raw_spin_unlock(&syslog_lock); @@ -347,7 +347,7 @@ index b992be31824f..dde1696d7564 100644 } console_unlock(); console_sysfs_notify(); -@@ -3415,10 +3375,10 @@ void kmsg_dump(enum kmsg_dump_reason reason) +@@ -3444,10 +3404,10 @@ void kmsg_dump(enum kmsg_dump_reason reason) /* initialize iterator with data about the stored records */ iter.active = true; @@ -360,7 +360,7 @@ index b992be31824f..dde1696d7564 100644 /* invoke dumper which will iterate over records */ dumper->dump(dumper, reason, &iter); -@@ -3505,9 +3465,9 @@ bool kmsg_dump_get_line(struct kmsg_dumper_iter *iter, bool syslog, +@@ -3534,9 +3494,9 @@ bool kmsg_dump_get_line(struct kmsg_dumper_iter *iter, bool syslog, unsigned long flags; bool ret; @@ -372,7 +372,7 @@ index b992be31824f..dde1696d7564 100644 return ret; } -@@ -3547,7 +3507,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog, +@@ -3576,7 +3536,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog, if (!iter->active || !buf || !size) goto out; @@ -381,7 +381,7 @@ index b992be31824f..dde1696d7564 100644 if (prb_read_valid_info(prb, iter->cur_seq, &info, NULL)) { if (info.seq != iter->cur_seq) { /* messages are gone, move to first available one */ -@@ -3557,7 +3517,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog, +@@ -3586,7 +3546,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog, /* last entry */ if (iter->cur_seq >= iter->next_seq) { @@ -390,7 +390,7 @@ index b992be31824f..dde1696d7564 100644 goto out; } -@@ -3591,7 +3551,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog, +@@ -3620,7 +3580,7 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog, iter->next_seq = next_seq; ret = true; @@ -399,7 +399,7 @@ index b992be31824f..dde1696d7564 100644 out: if (len_out) *len_out = len; -@@ -3627,9 +3587,9 @@ void kmsg_dump_rewind(struct kmsg_dumper_iter *iter) +@@ -3656,9 +3616,9 @@ void kmsg_dump_rewind(struct kmsg_dumper_iter *iter) { unsigned long flags; @@ -412,7 +412,7 @@ index b992be31824f..dde1696d7564 100644 EXPORT_SYMBOL_GPL(kmsg_dump_rewind); diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c -index 2e9e3ed7d63e..7df8a88d4115 100644 +index 2e9e3ed7d63ef..7df8a88d4115e 100644 --- a/kernel/printk/printk_safe.c +++ b/kernel/printk/printk_safe.c @@ -16,7 +16,7 @@ @@ -482,5 +482,5 @@ index 2e9e3ed7d63e..7df8a88d4115 100644 return vprintk_nmi(fmt, args); -- -2.43.0 +2.44.0 |