diff options
author | Keith Packard <keithpac@amazon.com> | 2021-09-18 11:44:35 +0300 |
---|---|---|
committer | Ard Biesheuvel <ardb@kernel.org> | 2021-09-27 17:54:01 +0300 |
commit | 19f29aebd929c31c5cc901f38a9295617b602c38 (patch) | |
tree | 3d021fe74ab2bdc9563291d4daa6f03a252b12ce /arch/arm/kernel/head.S | |
parent | dfbdcda280eb762bae2184145cc0702932d41798 (diff) | |
download | linux-19f29aebd929c31c5cc901f38a9295617b602c38.tar.xz |
ARM: smp: Pass task to secondary_start_kernel
This avoids needing to compute the task pointer in this function, which
will no longer be possible once we move thread_info off the stack.
Signed-off-by: Keith Packard <keithpac@amazon.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Amit Daniel Kachhap <amit.kachhap@arm.com>
Diffstat (limited to 'arch/arm/kernel/head.S')
-rw-r--r-- | arch/arm/kernel/head.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 29070eb8df7d..fa44e2d9f0b0 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -424,8 +424,9 @@ ENDPROC(secondary_startup) ENDPROC(secondary_startup_arm) ENTRY(__secondary_switched) - ldr_l r7, secondary_data + 12 @ get secondary_data.stack - mov sp, r7 + adr_l r7, secondary_data + 12 @ get secondary_data.stack + ldr sp, [r7] + ldr r0, [r7, #4] @ get secondary_data.task mov fp, #0 b secondary_start_kernel ENDPROC(__secondary_switched) |