[PATCH 4.19-rt] Revert "percpu: include irqflags.h for raw_local_irq_save()"

Ben Hutchings posted 1 patch 2 years, 9 months ago
include/asm-generic/percpu.h | 1 -
1 file changed, 1 deletion(-)
[PATCH 4.19-rt] Revert "percpu: include irqflags.h for raw_local_irq_save()"
Posted by Ben Hutchings 2 years, 9 months ago
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>
---
 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
 
Re: [PATCH 4.19-rt] Revert "percpu: include irqflags.h for raw_local_irq_save()"
Posted by Daniel Wagner 2 years, 9 months ago
On Sat, 10 Dec 2022 00:06:17 +0100, Ben Hutchings wrote:
> 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'?
> 
> [...]

Applied, thanks!

[1/1] Revert "percpu: include irqflags.h for raw_local_irq_save()"
      commit: 2c16891623cc7e8c0c4144f8665d117c7fc94552

Best regards,
-- 
Daniel Wagner <wagi@monom.org>