diff options
| author |   Ard Biesheuvel <ardb@kernel.org> | 2021-11-04 09:26:28 +0100 |
|---|---|---|
| committer |   Helge Deller <deller@gmx.de> | 2021-11-04 11:21:47 +0100 |
| commit | 2a2e8202c7a16a85a881ad2b6e32ccbebdc01dda (patch) | |
| tree | 158d0d1dd2d9e7d7a54a19e97e69f5780b4ec6ef /arch/parisc/kernel/smp.c | |
| parent | parisc: Don't disable interrupts in cmpxchg and futex operations (diff) | |
| download | linux-dev-2a2e8202c7a16a85a881ad2b6e32ccbebdc01dda.tar.xz linux-dev-2a2e8202c7a16a85a881ad2b6e32ccbebdc01dda.zip | |
parisc: move CPU field back into thread_info
In commit 2214c0e77259 ("parisc: Move thread_info into task struct")
PA-RISC gained support for THREAD_INFO_IN_TASK while changes were
already underway to keep the CPU field in thread_info rather than move
it into task_struct when THREAD_INFO_IN_TASK is enabled. The result is a
broken build for all PA-RISC configs that enable SMP.
So let's partially revert that commit, and get rid of the ugly hack to
get at the offset of task_struct::cpu without having to include
linux/sched.h, and put the CPU field back where it was before.
Reported-by: Guenter Roeck <linux@roeck-us.net>
Fixes: bcf9033e5449 ("sched: move CPU field back into thread_info if THREAD_INFO_IN_TASK=y")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/kernel/smp.c')
| -rw-r--r-- | arch/parisc/kernel/smp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 171925285f3e..a32a882a2d58 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c @@ -339,8 +339,6 @@ int smp_boot_one_cpu(int cpuid, struct task_struct *idle) const struct cpuinfo_parisc *p = &per_cpu(cpu_data, cpuid); long timeout; - idle->cpu = cpuid; - /* Let _start know what logical CPU we're booting ** (offset into init_tasks[],cpu_data[]) */ |