Merge tag 'riscv-for-linus-5.16-mw1' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / arch / riscv / kernel / head.S

diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S
index ed316d0..f52f01e 100644 (file)
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
@@ -203,6 +203,7 @@ setup_trap_vector:
        csrw CSR_SCRATCH, zero
        ret
 
+.align 2
 .Lsecondary_park:
        /* We lack SMP support or have too many harts, so park this hart */
        wfi
@@ -329,7 +330,6 @@ clear_bss_done:
        call setup_trap_vector
        /* Restore C environment */
        la tp, init_task
-       sw zero, TASK_TI_CPU(tp)
        la sp, init_thread_union + THREAD_SIZE
 
 #ifdef CONFIG_KASAN