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

[platform/kernel/linux-starfive.git] / arch / powerpc / kernel / smp.c

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index d96b0e3..c23ee84 100644 (file)
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -1223,7 +1223,7 @@ static void cpu_idle_thread_init(unsigned int cpu, struct task_struct *idle)
        paca_ptrs[cpu]->kstack = (unsigned long)task_stack_page(idle) +
                                 THREAD_SIZE - STACK_FRAME_OVERHEAD;
 #endif
-       idle->cpu = cpu;
+       task_thread_info(idle)->cpu = cpu;
        secondary_current = current_set[cpu] = idle;
 }
 
@@ -1725,8 +1725,6 @@ void __cpu_die(unsigned int cpu)
 
 void arch_cpu_idle_dead(void)
 {
-       sched_preempt_enable_no_resched();
-
        /*
         * Disable on the down path. This will be re-enabled by
         * start_secondary() via start_secondary_resume() below