summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0099-console-add-write_atomic-interface.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:36 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:36 +0000
commit429d3efd5669e129a6168d62edb6832e36b7a2a0 (patch)
tree14b99403f823ded018ba76aa450e8687247796b8 /debian/patches-rt/0099-console-add-write_atomic-interface.patch
parentMerging upstream version 5.10.216. (diff)
downloadlinux-429d3efd5669e129a6168d62edb6832e36b7a2a0.tar.xz
linux-429d3efd5669e129a6168d62edb6832e36b7a2a0.zip
Adding debian version 5.10.216-1.debian/5.10.216-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0099-console-add-write_atomic-interface.patch')
-rw-r--r--debian/patches-rt/0099-console-add-write_atomic-interface.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0099-console-add-write_atomic-interface.patch b/debian/patches-rt/0099-console-add-write_atomic-interface.patch
index 86f553013..31172c582 100644
--- a/debian/patches-rt/0099-console-add-write_atomic-interface.patch
+++ b/debian/patches-rt/0099-console-add-write_atomic-interface.patch
@@ -1,8 +1,8 @@
-From a021f069828ba9181d19f5ee9a977cf305ddaf19 Mon Sep 17 00:00:00 2001
+From e8bf862a51dbc3aab9ddd6d816618f05c5a9a502 Mon Sep 17 00:00:00 2001
From: John Ogness <john.ogness@linutronix.de>
Date: Mon, 30 Nov 2020 01:42:01 +0106
Subject: [PATCH 099/323] console: add write_atomic interface
-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
Add a write_atomic() callback to the console. This is an optional
function for console drivers. The function must be atomic (including
@@ -31,7 +31,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
2 files changed, 104 insertions(+)
diff --git a/include/linux/console.h b/include/linux/console.h
-index bc2a749e6f0d..613df76903f5 100644
+index bc2a749e6f0d4..613df76903f54 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -141,6 +141,7 @@ static inline int con_debug_leave(void)
@@ -51,10 +51,10 @@ index bc2a749e6f0d..613df76903f5 100644
+
#endif /* _LINUX_CONSOLE_H */
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index 57f3b8d7f35c..8768473712b2 100644
+index 613345a5cec8c..c32af4f006093 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
-@@ -3551,3 +3551,103 @@ void kmsg_dump_rewind(struct kmsg_dumper_iter *iter)
+@@ -3580,3 +3580,103 @@ void kmsg_dump_rewind(struct kmsg_dumper_iter *iter)
EXPORT_SYMBOL_GPL(kmsg_dump_rewind);
#endif
@@ -159,5 +159,5 @@ index 57f3b8d7f35c..8768473712b2 100644
+}
+EXPORT_SYMBOL(console_atomic_unlock);
--
-2.43.0
+2.44.0