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/0084-printk-refactor-kmsg_dump_get_buffer.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/0084-printk-refactor-kmsg_dump_get_buffer.patch')
| -rw-r--r-- | debian/patches-rt/0084-printk-refactor-kmsg_dump_get_buffer.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches-rt/0084-printk-refactor-kmsg_dump_get_buffer.patch b/debian/patches-rt/0084-printk-refactor-kmsg_dump_get_buffer.patch index dd1390103..9089ced31 100644 --- a/debian/patches-rt/0084-printk-refactor-kmsg_dump_get_buffer.patch +++ b/debian/patches-rt/0084-printk-refactor-kmsg_dump_get_buffer.patch @@ -1,8 +1,8 @@ -From b6e17f3557ef5e32212483ca92910ea28eb21eeb Mon Sep 17 00:00:00 2001 +From d7985b936918448708ec582eae418a02a840db84 Mon Sep 17 00:00:00 2001 From: John Ogness <john.ogness@linutronix.de> Date: Mon, 30 Nov 2020 01:41:56 +0106 Subject: [PATCH 084/323] printk: refactor kmsg_dump_get_buffer() -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_get_buffer() requires nearly the same logic as syslog_print_all(), but uses different variable names and @@ -22,7 +22,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h -index 235c50982c2d..4095a34db0fa 100644 +index 235c50982c2d7..4095a34db0fa3 100644 --- a/include/linux/kmsg_dump.h +++ b/include/linux/kmsg_dump.h @@ -62,7 +62,7 @@ bool kmsg_dump_get_line(struct kmsg_dumper *dumper, bool syslog, @@ -35,10 +35,10 @@ index 235c50982c2d..4095a34db0fa 100644 void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index 044bb3791896..ad7edcb693d4 100644 +index 92762417a2b2e..48a3311fabee5 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -3429,7 +3429,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_line); +@@ -3458,7 +3458,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_line); * read. */ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, @@ -47,7 +47,7 @@ index 044bb3791896..ad7edcb693d4 100644 { struct printk_info info; unsigned int line_count; -@@ -3437,12 +3437,10 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, +@@ -3466,12 +3466,10 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, unsigned long flags; u64 seq; u64 next_seq; @@ -61,7 +61,7 @@ index 044bb3791896..ad7edcb693d4 100644 if (!dumper->active || !buf || !size) goto out; -@@ -3460,48 +3458,54 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, +@@ -3489,48 +3487,54 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, goto out; } @@ -141,5 +141,5 @@ index 044bb3791896..ad7edcb693d4 100644 } EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer); -- -2.43.0 +2.44.0 |