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 <[email protected]>
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 <[email protected]>
---
arch/powerpc/kernel/setup_64.c | 2 ++
1 file changed, 2 insertions(+)
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
--
2.39.1
--
Cheers,
Stephen Rothwell
Stephen Rothwell <[email protected]> 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
On Thu, 2017-11-02 at 06:49:36 UTC, Stephen Rothwell wrote:
> Hi all,
>
> After merging the powerpc tree, today's linux-next build (powerpc64
> allnoconfig) failed like this:
>
> arch/powerpc/kernel/irq.o: In function `.replay_system_reset':
> irq.c:(.text+0x10): undefined reference to `.ppc_save_regs'
>
> Caused by commit
>
> 78adf6c214f0 ("powerpc/64s: Implement system reset idle wakeup reason")
>
> I have applied the following fix patch:
>
> From: Stephen Rothwell <[email protected]>
> Date: Thu, 2 Nov 2017 17:45:18 +1100
> Subject: [PATCH] powerpc/64s: ppc_save_regs is now needed for all 64s builds
>
> Fixes: 78adf6c214f0 ("powerpc/64s: Implement system reset idle wakeup reason")
> Signed-off-by: Stephen Rothwell <[email protected]>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/fc2a5a6161a26b386eb0936b74a852
cheers
From 1582936030260191790@xxx Thu Nov 02 06:50:36 +0000 2017
X-GM-THRID: 1582936030260191790
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread