| Message ID | 20200731085836.139d3180@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: build failure after merge of the origin tree | expand |
Hi all, On Fri, 31 Jul 2020 08:58:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > After merging the origin tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > In file included from include/linux/random.h:14, > from arch/arm/kernel/signal.c:8: > arch/arm/include/asm/percpu.h: In function '__my_cpu_offset': > arch/arm/include/asm/percpu.h:29:34: error: 'current_stack_pointer' undeclared (first use in this function); did you mean 'user_stack_pointer'? > 29 | : "Q" (*(const unsigned long *)current_stack_pointer)); > | ^~~~~~~~~~~~~~~~~~~~~ > | user_stack_pointer > > Presumably aused by commit > > 1c9df907da83 ("random: fix circular include dependency on arm64 after addition of percpu.h") > > I have added this fix patch for today: Looks like I sould read further ahead in my email :-)
diff --git a/arch/arm/include/asm/percpu.h b/arch/arm/include/asm/percpu.h index f44f448537f2..ebfa06bebea5 100644 --- a/arch/arm/include/asm/percpu.h +++ b/arch/arm/include/asm/percpu.h @@ -10,6 +10,9 @@ * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7 */ #if defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6) + +#include <asm/thread_info.h> /* for current_stack_pointer */ + static inline void set_my_cpu_offset(unsigned long off) { /* Set TPIDRPRW */
Hi all, After merging the origin tree, today's linux-next build (arm multi_v7_defconfig) failed like this: In file included from include/linux/random.h:14, from arch/arm/kernel/signal.c:8: arch/arm/include/asm/percpu.h: In function '__my_cpu_offset': arch/arm/include/asm/percpu.h:29:34: error: 'current_stack_pointer' undeclared (first use in this function); did you mean 'user_stack_pointer'? 29 | : "Q" (*(const unsigned long *)current_stack_pointer)); | ^~~~~~~~~~~~~~~~~~~~~ | user_stack_pointer Presumably aused by commit 1c9df907da83 ("random: fix circular include dependency on arm64 after addition of percpu.h") I have added this fix patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 31 Jul 2020 08:50:31 +1000 Subject: [PATCH] arm: include asm/thread_info.h in asm/percpu.h This need was uncovered by commit 1c9df907da83 ("random: fix circular include dependency on arm64 after addition of percpu.h") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/arm/include/asm/percpu.h | 3 +++ 1 file changed, 3 insertions(+)