diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches-rt/0013-printk-nbcon-Do-not-rely-on-proxy-headers.patch (renamed from debian/patches-rt/0015-printk-nbcon-Do-not-rely-on-proxy-headers.patch) | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/debian/patches-rt/0015-printk-nbcon-Do-not-rely-on-proxy-headers.patch b/debian/patches-rt/0013-printk-nbcon-Do-not-rely-on-proxy-headers.patch index 3ea3dd3d77..4524b5dcf4 100644 --- a/debian/patches-rt/0015-printk-nbcon-Do-not-rely-on-proxy-headers.patch +++ b/debian/patches-rt/0013-printk-nbcon-Do-not-rely-on-proxy-headers.patch @@ -1,7 +1,7 @@ From: John Ogness <john.ogness@linutronix.de> Date: Mon, 19 Feb 2024 17:35:49 +0000 -Subject: [PATCH 15/48] printk: nbcon: Do not rely on proxy headers -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.8/older/patches-6.8.2-rt11.tar.xz +Subject: [PATCH 13/46] printk: nbcon: Do not rely on proxy headers +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.9/older/patches-6.9-rt5.tar.xz The headers kernel.h, serial_core.h, and console.h allow for the definitions of many types and functions from other headers. @@ -12,12 +12,13 @@ list alphabetically to be able to easily detect duplicates. Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: John Ogness <john.ogness@linutronix.de> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Acked-by: Petr Mladek <pmladek@suse.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- kernel/printk/internal.h | 8 ++++++-- - kernel/printk/nbcon.c | 12 +++++++++++- + kernel/printk/nbcon.c | 13 ++++++++++++- kernel/printk/printk_ringbuffer.h | 2 ++ - 3 files changed, 19 insertions(+), 3 deletions(-) + 3 files changed, 20 insertions(+), 3 deletions(-) --- a/kernel/printk/internal.h +++ b/kernel/printk/internal.h @@ -48,13 +49,13 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> __printf(4, 0) --- a/kernel/printk/nbcon.c +++ b/kernel/printk/nbcon.c -@@ -2,14 +2,24 @@ +@@ -2,13 +2,24 @@ // Copyright (C) 2022 Linutronix GmbH, John Ogness // Copyright (C) 2022 Intel, Thomas Gleixner -#include <linux/kernel.h> +#include <linux/atomic.h> - #include <linux/bug.h> ++#include <linux/bug.h> #include <linux/console.h> #include <linux/delay.h> +#include <linux/errno.h> |