diff options
Diffstat (limited to 'debian/patches-rt/0093-printk-kmsg_dump-remove-_nolock-variants.patch')
| -rw-r--r-- | debian/patches-rt/0093-printk-kmsg_dump-remove-_nolock-variants.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/debian/patches-rt/0093-printk-kmsg_dump-remove-_nolock-variants.patch b/debian/patches-rt/0093-printk-kmsg_dump-remove-_nolock-variants.patch index 6ad034c1a..667c73b93 100644 --- a/debian/patches-rt/0093-printk-kmsg_dump-remove-_nolock-variants.patch +++ b/debian/patches-rt/0093-printk-kmsg_dump-remove-_nolock-variants.patch @@ -1,8 +1,8 @@ -From 171ee108014d67150846f1b8f978921cefc7b1e3 Mon Sep 17 00:00:00 2001 +From 7c35d5807ad1cb9afbbd73a093ed3b4ed447cd9c Mon Sep 17 00:00:00 2001 From: John Ogness <john.ogness@linutronix.de> Date: Mon, 21 Dec 2020 10:27:58 +0106 Subject: [PATCH 093/323] printk: kmsg_dump: remove _nolock() variants -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 kmsg_dump_rewind() and kmsg_dump_get_line() are lockless, so there is no need for _nolock() variants. Remove these functions and switch all @@ -20,7 +20,7 @@ Signed-off-by: John Ogness <john.ogness@linutronix.de> 4 files changed, 15 insertions(+), 75 deletions(-) diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c -index 9f62cca6c594..2eef587bf51d 100644 +index 9f62cca6c5948..2eef587bf51d5 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -3015,9 +3015,9 @@ dump_log_buf(void) @@ -36,7 +36,7 @@ index 9f62cca6c594..2eef587bf51d 100644 printf("%s", buf); } diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h -index 2fdb10ab1799..86673930c8ea 100644 +index 2fdb10ab17994..86673930c8ea2 100644 --- a/include/linux/kmsg_dump.h +++ b/include/linux/kmsg_dump.h @@ -60,18 +60,13 @@ struct kmsg_dumper { @@ -85,10 +85,10 @@ index 2fdb10ab1799..86673930c8ea 100644 { } diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c -index 048baadd7a41..1f5c577b926e 100644 +index aa424a1d65d01..b97d05072ca4b 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c -@@ -2182,8 +2182,8 @@ static int kdb_dmesg(int argc, const char **argv) +@@ -2180,8 +2180,8 @@ static int kdb_dmesg(int argc, const char **argv) kdb_set(2, setargs); } @@ -99,7 +99,7 @@ index 048baadd7a41..1f5c577b926e 100644 n++; if (lines < 0) { -@@ -2215,8 +2215,8 @@ static int kdb_dmesg(int argc, const char **argv) +@@ -2213,8 +2213,8 @@ static int kdb_dmesg(int argc, const char **argv) if (skip >= n || skip < 0) return 0; @@ -111,10 +111,10 @@ index 048baadd7a41..1f5c577b926e 100644 skip--; continue; diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index dde1696d7564..031ce3f00141 100644 +index 9fde03f1e29bf..e18f1f09ab727 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -3387,7 +3387,7 @@ void kmsg_dump(enum kmsg_dump_reason reason) +@@ -3416,7 +3416,7 @@ void kmsg_dump(enum kmsg_dump_reason reason) } /** @@ -123,7 +123,7 @@ index dde1696d7564..031ce3f00141 100644 * @iter: kmsg dumper iterator * @syslog: include the "<4>" prefixes * @line: buffer to copy the line to -@@ -3402,18 +3402,18 @@ void kmsg_dump(enum kmsg_dump_reason reason) +@@ -3431,18 +3431,18 @@ void kmsg_dump(enum kmsg_dump_reason reason) * * A return value of FALSE indicates that there are no more records to * read. @@ -146,7 +146,7 @@ index dde1696d7564..031ce3f00141 100644 prb_rec_init_rd(&r, &info, line, size); if (!iter->active) -@@ -3437,40 +3437,11 @@ bool kmsg_dump_get_line_nolock(struct kmsg_dumper_iter *iter, bool syslog, +@@ -3466,40 +3466,11 @@ bool kmsg_dump_get_line_nolock(struct kmsg_dumper_iter *iter, bool syslog, iter->cur_seq = r.info->seq + 1; ret = true; out: @@ -188,7 +188,7 @@ index dde1696d7564..031ce3f00141 100644 EXPORT_SYMBOL_GPL(kmsg_dump_get_line); /** -@@ -3559,22 +3530,6 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog, +@@ -3588,22 +3559,6 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog, } EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer); @@ -211,7 +211,7 @@ index dde1696d7564..031ce3f00141 100644 /** * kmsg_dump_rewind - reset the iterator * @iter: kmsg dumper iterator -@@ -3588,7 +3543,8 @@ void kmsg_dump_rewind(struct kmsg_dumper_iter *iter) +@@ -3617,7 +3572,8 @@ void kmsg_dump_rewind(struct kmsg_dumper_iter *iter) unsigned long flags; printk_safe_enter_irqsave(flags); @@ -222,5 +222,5 @@ index dde1696d7564..031ce3f00141 100644 } EXPORT_SYMBOL_GPL(kmsg_dump_rewind); -- -2.43.0 +2.44.0 |