| Message ID | 20200623083721.454517573@infradead.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | lockdep: Change IRQ state tracking to use per-cpu variables | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/merge (3ddb24ac766e1b028462b27aeae05c2bf17c12c5) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/next (5b14671be58d0084e7e2d1cc9c2c36a94467f6e0) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linus/master (dd0d718152e4c65b173070d48ea9dfc06894c3e5) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/fixes (c0e1c8c22bebecef40097c80c1c74492ff96d081) |
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch linux-next (37e7f89b58c9732c6843602ec3e1db9aa00086f2) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On Tue, Jun 23, 2020 at 10:36:51AM +0200, Peter Zijlstra wrote: > 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@infradead.org> > --- > arch/arm/include/asm/percpu.h | 2 ++ > 1 file changed, 2 insertions(+) > > --- a/arch/arm/include/asm/percpu.h > +++ b/arch/arm/include/asm/percpu.h > @@ -10,6 +10,8 @@ > * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7 > */ > #if defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6) > +register unsigned long current_stack_pointer asm ("sp"); If you define this unconditionally, then we can probably get rid of the copy in asm/thread_info.h, rather than duplicate the same #define. Will
On Tue, Jun 23, 2020 at 10:02:57AM +0100, Will Deacon wrote: > On Tue, Jun 23, 2020 at 10:36:51AM +0200, Peter Zijlstra wrote: > > 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@infradead.org> > > --- > > arch/arm/include/asm/percpu.h | 2 ++ > > 1 file changed, 2 insertions(+) > > > > --- a/arch/arm/include/asm/percpu.h > > +++ b/arch/arm/include/asm/percpu.h > > @@ -10,6 +10,8 @@ > > * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7 > > */ > > #if defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6) > > +register unsigned long current_stack_pointer asm ("sp"); > > If you define this unconditionally, then we can probably get rid of the > copy in asm/thread_info.h, rather than duplicate the same #define. The below delta seems to build arm-allnoconfig, arm-defconfig and arm-allmodconfig. Although please don't ask me how asm/thread_info.h includes asm/percpu.h Does that work for you? diff --git a/arch/arm/include/asm/percpu.h b/arch/arm/include/asm/percpu.h index e86e47486b6b1..e2fcb3cfd3de5 100644 --- a/arch/arm/include/asm/percpu.h +++ b/arch/arm/include/asm/percpu.h @@ -5,13 +5,13 @@ #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 */ #if defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6) -register unsigned long current_stack_pointer asm ("sp"); - static inline void set_my_cpu_offset(unsigned long off) { /* Set TPIDRPRW */ diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index 3609a6980c342..536b6b979f634 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -75,11 +75,6 @@ struct thread_info { .addr_limit = KERNEL_DS, \ } -/* - * 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 */
On Wed, Jun 24, 2020 at 07:53:20PM +0200, Peter Zijlstra wrote: > On Tue, Jun 23, 2020 at 10:02:57AM +0100, Will Deacon wrote: > > On Tue, Jun 23, 2020 at 10:36:51AM +0200, Peter Zijlstra wrote: > > > 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@infradead.org> > > > --- > > > arch/arm/include/asm/percpu.h | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > --- a/arch/arm/include/asm/percpu.h > > > +++ b/arch/arm/include/asm/percpu.h > > > @@ -10,6 +10,8 @@ > > > * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7 > > > */ > > > #if defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6) > > > +register unsigned long current_stack_pointer asm ("sp"); > > > > If you define this unconditionally, then we can probably get rid of the > > copy in asm/thread_info.h, rather than duplicate the same #define. > > The below delta seems to build arm-allnoconfig, arm-defconfig and > arm-allmodconfig. > > Although please don't ask me how asm/thread_info.h includes asm/percpu.h > > Does that work for you? Yes, thanks! I can't believe you removed the helpful comment. > -/* > - * how to get the current stack pointer in C > - */ Will
--- a/arch/arm/include/asm/percpu.h +++ b/arch/arm/include/asm/percpu.h @@ -10,6 +10,8 @@ * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7 */ #if defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6) +register unsigned long current_stack_pointer asm ("sp"); + static inline void set_my_cpu_offset(unsigned long off) { /* Set TPIDRPRW */
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@infradead.org> --- arch/arm/include/asm/percpu.h | 2 ++ 1 file changed, 2 insertions(+)