diff options
| author |  Ard Biesheuvel <ardb@kernel.org>
| 2021-09-14 14:10:33 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org>
| 2021-09-30 16:13:10 +0200 |
| commit | bcf9033e5449bdcaa9bed46467a7141a8049dadb (patch) | |
| tree | 41ddaa2e3be76b9277445e999bfe991a2eb1a7c2 /arch/arm64/kernel/head.S | |
| parent | powerpc: add CPU field to struct thread_info (diff) | |
| download | linux-bcf9033e5449bdcaa9bed46467a7141a8049dadb.tar.gz linux-bcf9033e5449bdcaa9bed46467a7141a8049dadb.tar.bz2 linux-bcf9033e5449bdcaa9bed46467a7141a8049dadb.zip | |
sched: move CPU field back into thread_info if THREAD_INFO_IN_TASK=y
THREAD_INFO_IN_TASK moved the CPU field out of thread_info, but this
causes some issues on architectures that define raw_smp_processor_id()
in terms of this field, due to the fact that #include'ing linux/sched.h
to get at struct task_struct is problematic in terms of circular
dependencies.
Given that thread_info and task_struct are the same data structure
anyway when THREAD_INFO_IN_TASK=y, let's move it back so that having
access to the type definition of struct thread_info is sufficient to
reference the CPU number of the current task.
Note that this requires THREAD_INFO_IN_TASK's definition of the
task_thread_info() helper to be updated, as task_cpu() takes a
pointer-to-const, whereas task_thread_info() (which is used to generate
lvalues as well), needs a non-const pointer. So make it a macro instead.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 17962452e31d..6a98f1a38c29 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -412,7 +412,7 @@ SYM_FUNC_END(__create_page_tables) scs_load \tsk adr_l \tmp1, __per_cpu_offset - ldr w\tmp2, [\tsk, #TSK_CPU] + ldr w\tmp2, [\tsk, #TSK_TI_CPU] ldr \tmp1, [\tmp1, \tmp2, lsl #3] set_this_cpu_offset \tmp1 .endm |