summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0016-printk-nbcon-Fix-kerneldoc-for-enums.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 18:50:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 18:50:59 +0000
commitba6b167af6ee5e63ca79ad22e7719644aed12b2c (patch)
tree62272cbe2fb256ecb90fa6e2cbfa509541954d28 /debian/patches-rt/0016-printk-nbcon-Fix-kerneldoc-for-enums.patch
parentMerging upstream version 6.8.9. (diff)
downloadlinux-ba6b167af6ee5e63ca79ad22e7719644aed12b2c.tar.xz
linux-ba6b167af6ee5e63ca79ad22e7719644aed12b2c.zip
Merging debian version 6.8.9-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0016-printk-nbcon-Fix-kerneldoc-for-enums.patch')
-rw-r--r--debian/patches-rt/0016-printk-nbcon-Fix-kerneldoc-for-enums.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches-rt/0016-printk-nbcon-Fix-kerneldoc-for-enums.patch b/debian/patches-rt/0016-printk-nbcon-Fix-kerneldoc-for-enums.patch
new file mode 100644
index 0000000000..246deca24d
--- /dev/null
+++ b/debian/patches-rt/0016-printk-nbcon-Fix-kerneldoc-for-enums.patch
@@ -0,0 +1,36 @@
+From: John Ogness <john.ogness@linutronix.de>
+Date: Fri, 9 Feb 2024 10:46:58 +0000
+Subject: [PATCH 16/48] printk: nbcon: Fix kerneldoc for enums
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.8/older/patches-6.8.2-rt11.tar.xz
+
+Kerneldoc requires enums to be specified as such. Otherwise it is
+interpreted as function documentation.
+
+Signed-off-by: John Ogness <john.ogness@linutronix.de>
+Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
+Reviewed-by: Petr Mladek <pmladek@suse.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/console.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/linux/console.h
++++ b/include/linux/console.h
+@@ -137,7 +137,7 @@ static inline int con_debug_leave(void)
+ */
+
+ /**
+- * cons_flags - General console flags
++ * enum cons_flags - General console flags
+ * @CON_PRINTBUFFER: Used by newly registered consoles to avoid duplicate
+ * output of messages that were already shown by boot
+ * consoles or read by userspace via syslog() syscall.
+@@ -218,7 +218,7 @@ struct nbcon_state {
+ static_assert(sizeof(struct nbcon_state) <= sizeof(int));
+
+ /**
+- * nbcon_prio - console owner priority for nbcon consoles
++ * enum nbcon_prio - console owner priority for nbcon consoles
+ * @NBCON_PRIO_NONE: Unused
+ * @NBCON_PRIO_NORMAL: Normal (non-emergency) usage
+ * @NBCON_PRIO_EMERGENCY: Emergency output (WARN/OOPS...)