| Message ID | 20230210143829.4ab676bd@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: build failure after merge of the powerpc tree | expand |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi all, > > After merging the powerpc tree, today's linux-next build (powerpc64 > allnoconfig) failed like this: > > arch/powerpc/kernel/setup_64.c: In function 'early_setup': > arch/powerpc/kernel/setup_64.c:400:34: error: 'struct thread_info' has no member named 'cpu' > 400 | task_thread_info(current)->cpu = boot_cpuid; // fix task_cpu(current) > | ^~ > > Caused by commit > > 0ecf51ca51e5 ("powerpc/64: Fix task_cpu in early boot when booting non-zero cpuid") > > # CONFIG_SMP is not set Thanks. I squashed in the fix. cheers
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 78d8a105764b..b2e0d3ce4261 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -397,7 +397,9 @@ void __init early_setup(unsigned long dt_ptr) setup_paca(paca_ptrs[boot_cpuid]); /* install the paca into registers */ // smp_processor_id() now reports boot_cpuid +#ifdef CONFIG_SMP task_thread_info(current)->cpu = boot_cpuid; // fix task_cpu(current) +#endif /* * Configure exception handlers. This include setting up trampolines
Hi all, After merging the powerpc tree, today's linux-next build (powerpc64 allnoconfig) failed like this: arch/powerpc/kernel/setup_64.c: In function 'early_setup': arch/powerpc/kernel/setup_64.c:400:34: error: 'struct thread_info' has no member named 'cpu' 400 | task_thread_info(current)->cpu = boot_cpuid; // fix task_cpu(current) | ^~ Caused by commit 0ecf51ca51e5 ("powerpc/64: Fix task_cpu in early boot when booting non-zero cpuid") # CONFIG_SMP is not set I applied the following fix up for today. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 10 Feb 2023 14:21:33 +1100 Subject: [PATCH] fixup for "powerpc/64: Fix task_cpu in early boot when booting non-zero cpuid" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/kernel/setup_64.c | 2 ++ 1 file changed, 2 insertions(+)