diff options
| author | Will Deacon <will@kernel.org> | 2020-10-09 13:24:17 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-10-09 13:24:17 +0300 |
| commit | d13027bb35e089bc1bb9f19c4976decf32a09b97 (patch) | |
| tree | fe5e98288f7c0bdb4842ae78f6793d20288d66db /arch/arm64/kernel/head.S | |
| parent | a82e4ef0417b89c6707706b9194fb0c7872a4c6a (diff) | |
| download | linux-d13027bb35e089bc1bb9f19c4976decf32a09b97.tar.xz | |
Revert "arm64: initialize per-cpu offsets earlier"
This reverts commit 353e228eb355be5a65a3c0996c774a0f46737fda.
Qian Cai reports that TX2 no longer boots with his .config as it appears
that task_cpu() gets instrumented and used before KASAN has been
initialised.
Although Mark has a proposed fix, let's take the safe option of reverting
this for now and sorting it out properly later.
Link: https://lore.kernel.org/r/711bc57a314d8d646b41307008db2845b7537b3d.camel@redhat.com
Reported-by: Qian Cai <cai@redhat.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index e28c9d4e5278..d8d9caf02834 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -448,8 +448,6 @@ SYM_FUNC_START_LOCAL(__primary_switched) bl __pi_memset dsb ishst // Make zero page visible to PTW - bl init_this_cpu_offset - #ifdef CONFIG_KASAN bl kasan_early_init #endif @@ -756,7 +754,6 @@ SYM_FUNC_START_LOCAL(__secondary_switched) ptrauth_keys_init_cpu x2, x3, x4, x5 #endif - bl init_this_cpu_offset b secondary_start_kernel SYM_FUNC_END(__secondary_switched) |