summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0320-Revert-printk-declare-printk_deferred_-enter-safe-in.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:46:06 +0000
commit30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch)
tree968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0320-Revert-printk-declare-printk_deferred_-enter-safe-in.patch
parentMerging upstream version 5.10.216. (diff)
downloadlinux-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/0320-Revert-printk-declare-printk_deferred_-enter-safe-in.patch')
-rw-r--r--debian/patches-rt/0320-Revert-printk-declare-printk_deferred_-enter-safe-in.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0320-Revert-printk-declare-printk_deferred_-enter-safe-in.patch b/debian/patches-rt/0320-Revert-printk-declare-printk_deferred_-enter-safe-in.patch
index b52e5aa42..b3ad29040 100644
--- a/debian/patches-rt/0320-Revert-printk-declare-printk_deferred_-enter-safe-in.patch
+++ b/debian/patches-rt/0320-Revert-printk-declare-printk_deferred_-enter-safe-in.patch
@@ -1,9 +1,9 @@
-From f59d43768ad6d22235cbc9ec14f6307867aefefe Mon Sep 17 00:00:00 2001
+From ab0bfdba117458d38d667c9923d15c0dc8304ddd Mon Sep 17 00:00:00 2001
From: "Luis Claudio R. Goncalves" <lgoncalv@redhat.com>
Date: Thu, 8 Jun 2023 19:47:25 -0300
Subject: [PATCH 320/323] Revert "printk: declare
printk_deferred_{enter,safe}() in include/linux/printk.h"
-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
This reverts commit 32232bcd4e5300e678718d5c29da4dfa07ade01e.
@@ -21,7 +21,7 @@ Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
1 file changed, 19 deletions(-)
diff --git a/include/linux/printk.h b/include/linux/printk.h
-index 83c7734e9802..7e4352467d83 100644
+index 83c7734e98025..7e4352467d831 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -609,23 +609,4 @@ static inline void print_hex_dump_debug(const char *prefix_str, int prefix_type,
@@ -49,5 +49,5 @@ index 83c7734e9802..7e4352467d83 100644
-
#endif
--
-2.43.0
+2.44.0