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/include/asm/thread_info.h | |
| parent | 7e992711dddbdb1c27d077432d8440fefd44819f (diff) | |
| download | linux-2a2e8202c7a16a85a881ad2b6e32ccbebdc01dda.tar.gz linux-2a2e8202c7a16a85a881ad2b6e32ccbebdc01dda.tar.bz2 linux-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/include/asm/thread_info.h')
| -rw-r--r-- | arch/parisc/include/asm/thread_info.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h index 75657c2c54e1..1a58795f785c 100644 --- a/arch/parisc/include/asm/thread_info.h +++ b/arch/parisc/include/asm/thread_info.h @@ -9,6 +9,9 @@ struct thread_info { unsigned long flags; /* thread_info flags (see TIF_*) */ int preempt_count; /* 0=premptable, <0=BUG; will also serve as bh-counter */ +#ifdef CONFIG_SMP + unsigned int cpu; +#endif }; #define INIT_THREAD_INFO(tsk) \ |