]> www.infradead.org Git - users/dwmw2/linux.git/commit
parisc: move CPU field back into thread_info
authorArd Biesheuvel <ardb@kernel.org>
Thu, 4 Nov 2021 08:26:28 +0000 (09:26 +0100)
committerHelge Deller <deller@gmx.de>
Thu, 4 Nov 2021 10:21:47 +0000 (11:21 +0100)
commit2a2e8202c7a16a85a881ad2b6e32ccbebdc01dda
tree158d0d1dd2d9e7d7a54a19e97e69f5780b4ec6ef
parent7e992711dddbdb1c27d077432d8440fefd44819f
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>
arch/parisc/include/asm/smp.h
arch/parisc/include/asm/thread_info.h
arch/parisc/kernel/asm-offsets.c
arch/parisc/kernel/smp.c