The following commit has been merged into the locking/core branch of tip: Commit-ID: 28e5bfd81c8de77504703adf24ceff9301e3c7be Gitweb: https://git.kernel.org/tip/28e5bfd81c8de77504703adf24ceff9301e3c7be Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Fri, 29 May 2020 22:41:05 +02:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Fri, 10 Jul 2020 12:00:02 +02:00 s390: Break cyclic percpu include In order to use <asm/percpu.h> in irqflags.h, we need to make sure asm/percpu.h does not itself depend on irqflags.h Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Reviewed-by: Ingo Molnar <mingo@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20200623083721.396143816@xxxxxxxxxxxxx --- arch/s390/include/asm/smp.h | 1 + arch/s390/include/asm/thread_info.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h index 7326f11..f48a43b 100644 --- a/arch/s390/include/asm/smp.h +++ b/arch/s390/include/asm/smp.h @@ -10,6 +10,7 @@ #include <asm/sigp.h> #include <asm/lowcore.h> +#include <asm/processor.h> #define raw_smp_processor_id() (S390_lowcore.cpu_nr) diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h index e582fbe..13a04fc 100644 --- a/arch/s390/include/asm/thread_info.h +++ b/arch/s390/include/asm/thread_info.h @@ -24,7 +24,6 @@ #ifndef __ASSEMBLY__ #include <asm/lowcore.h> #include <asm/page.h> -#include <asm/processor.h> #define STACK_INIT_OFFSET \ (THREAD_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs))
|