summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0351-Revert-percpu-include-irqflags.h-for-raw_local_irq_s.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:15:16 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:15:28 +0000
commit0cf6719e1d2f19f831279583065810ceb5ecbd28 (patch)
tree34052095977dde7bec44b99f60acc8bb77325f76 /debian/patches-rt/0351-Revert-percpu-include-irqflags.h-for-raw_local_irq_s.patch
parentMerging upstream version 4.19.282. (diff)
downloadlinux-0cf6719e1d2f19f831279583065810ceb5ecbd28.tar.xz
linux-0cf6719e1d2f19f831279583065810ceb5ecbd28.zip
Merging debian version 4.19.282-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0351-Revert-percpu-include-irqflags.h-for-raw_local_irq_s.patch')
-rw-r--r--debian/patches-rt/0351-Revert-percpu-include-irqflags.h-for-raw_local_irq_s.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/debian/patches-rt/0351-Revert-percpu-include-irqflags.h-for-raw_local_irq_s.patch b/debian/patches-rt/0351-Revert-percpu-include-irqflags.h-for-raw_local_irq_s.patch
new file mode 100644
index 000000000..c552ddc91
--- /dev/null
+++ b/debian/patches-rt/0351-Revert-percpu-include-irqflags.h-for-raw_local_irq_s.patch
@@ -0,0 +1,48 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sat, 10 Dec 2022 00:06:17 +0100
+Subject: [PATCH 351/353] Revert "percpu: include irqflags.h for
+ raw_local_irq_save()"
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=c5e46c2fa591455d0c389c83add860375b0bf1db
+
+This reverts commit 0d796a9e6a93608b4dd84fbd09f01e912ae34bdc.
+
+After merging stable release 4.19.266 into the -rt branch, an x86
+build will fail with the following error:
+
+ .../include/linux/percpu-defs.h:49:34: error: 'PER_CPU_BASE_SECTION' undeclared here (not in a function); did you mean 'PER_CPU_FIRST_SECTION'?
+
+This is due to an #include loop:
+
+ <asm/percpu.h>
+ -> <linux/irqflags.h>
+ -> <asm/irqflags.h>
+ -> <asm/nospec-branch.h>
+ -> <asm/percpu.h>
+
+which appears after the merge because:
+
+- The reverted commit added <asm/percpu.h> -> <linux/irqflags.h>
+- 4.19.266 added <asm/nospec-branch.h> -> <asm/percpu.h>
+
+Neither upstream nor any other maintained stable-rt branch has this
+include, and my build succeeded without it. Revert it here as well.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Link: https://lore.kernel.org/r/Y5O/aVw/zHKqmpu7@decadent.org.uk
+Signed-off-by: Daniel Wagner <wagi@monom.org>
+---
+ include/asm-generic/percpu.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h
+index 942d64c0476e..1817a8415a5e 100644
+--- a/include/asm-generic/percpu.h
++++ b/include/asm-generic/percpu.h
+@@ -5,7 +5,6 @@
+ #include <linux/compiler.h>
+ #include <linux/threads.h>
+ #include <linux/percpu-defs.h>
+-#include <linux/irqflags.h>
+
+ #ifdef CONFIG_SMP
+