The following commit has been merged into the locking/core branch of tip: Commit-ID: a6342915881a687b07847b7c57628de07a256525 Gitweb: https://git.kernel.org/tip/a6342915881a687b07847b7c57628de07a256525 Author: Peter Zijlstra <pet...@infradead.org> AuthorDate: Mon, 22 Jun 2020 17:21:58 +02:00 Committer: Peter Zijlstra <pet...@infradead.org> CommitterDate: Fri, 10 Jul 2020 12:00:02 +02:00
arm: 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) <pet...@infradead.org> Reviewed-by: Ingo Molnar <mi...@kernel.org> Acked-by: Will Deacon <w...@kernel.org> Link: https://lkml.kernel.org/r/20200623083721.454517...@infradead.org --- arch/arm/include/asm/percpu.h | 2 ++ arch/arm/include/asm/thread_info.h | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/percpu.h b/arch/arm/include/asm/percpu.h index f44f448..e2fcb3c 100644 --- a/arch/arm/include/asm/percpu.h +++ b/arch/arm/include/asm/percpu.h @@ -5,6 +5,8 @@ #ifndef _ASM_ARM_PERCPU_H_ #define _ASM_ARM_PERCPU_H_ +register unsigned long current_stack_pointer asm ("sp"); + /* * Same as asm-generic/percpu.h, except that we store the per cpu offset * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index 3609a69..536b6b9 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -76,11 +76,6 @@ struct thread_info { } /* - * how to get the current stack pointer in C - */ -register unsigned long current_stack_pointer asm ("sp"); - -/* * how to get the thread information struct from C */ static inline struct thread_info *current_thread_info(void) __attribute_const__;
