diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:46:06 +0000 |
| commit | 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch) | |
| tree | 968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0094-printk-kmsg_dump-use-kmsg_dump_rewind.patch | |
| parent | Merging upstream version 5.10.216. (diff) | |
| download | linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.tar.xz linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.zip | |
Merging debian version 5.10.216-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0094-printk-kmsg_dump-use-kmsg_dump_rewind.patch')
| -rw-r--r-- | debian/patches-rt/0094-printk-kmsg_dump-use-kmsg_dump_rewind.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0094-printk-kmsg_dump-use-kmsg_dump_rewind.patch b/debian/patches-rt/0094-printk-kmsg_dump-use-kmsg_dump_rewind.patch index 7ff974d08..7600d18a8 100644 --- a/debian/patches-rt/0094-printk-kmsg_dump-use-kmsg_dump_rewind.patch +++ b/debian/patches-rt/0094-printk-kmsg_dump-use-kmsg_dump_rewind.patch @@ -1,8 +1,8 @@ -From 66a45e662dc7ecb7e9b519d3475c7893c0c1dc60 Mon Sep 17 00:00:00 2001 +From 5d97623648d3bccef67abeab3048214f70c5b693 Mon Sep 17 00:00:00 2001 From: John Ogness <john.ogness@linutronix.de> Date: Wed, 17 Feb 2021 18:23:16 +0100 Subject: [PATCH 094/323] printk: kmsg_dump: use kmsg_dump_rewind -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() is open coding the kmsg_dump_rewind(). Call kmsg_dump_rewind() instead. @@ -14,10 +14,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index 031ce3f00141..c553b235d068 100644 +index e18f1f09ab727..0d233c0573a50 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -3356,7 +3356,6 @@ void kmsg_dump(enum kmsg_dump_reason reason) +@@ -3385,7 +3385,6 @@ void kmsg_dump(enum kmsg_dump_reason reason) { struct kmsg_dumper_iter iter; struct kmsg_dumper *dumper; @@ -25,7 +25,7 @@ index 031ce3f00141..c553b235d068 100644 rcu_read_lock(); list_for_each_entry_rcu(dumper, &dump_list, list) { -@@ -3375,10 +3374,7 @@ void kmsg_dump(enum kmsg_dump_reason reason) +@@ -3404,10 +3403,7 @@ void kmsg_dump(enum kmsg_dump_reason reason) /* initialize iterator with data about the stored records */ iter.active = true; @@ -38,5 +38,5 @@ index 031ce3f00141..c553b235d068 100644 /* invoke dumper which will iterate over records */ dumper->dump(dumper, reason, &iter); -- -2.43.0 +2.44.0 |