Merge tag 'powerpc-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / smp.c

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 1788fe6c47da0d5a2358975fe1023ff50fc0fa39..447b78a87c8f2adcb5f46c0073b7cdbea84ec275 100644 (file)
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -1058,7 +1058,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
                        zalloc_cpumask_var_node(&per_cpu(cpu_coregroup_map, cpu),
                                                GFP_KERNEL, cpu_to_node(cpu));
 
-#ifdef CONFIG_NEED_MULTIPLE_NODES
+#ifdef CONFIG_NUMA
                /*
                 * numa_node_id() works after this.
                 */
@@ -1562,7 +1562,6 @@ void start_secondary(void *unused)
        smp_store_cpu_info(cpu);
        set_dec(tb_ticks_per_jiffy);
        rcu_cpu_starting(cpu);
-       preempt_disable();
        cpu_callin_map[cpu] = 1;
 
        if (smp_ops->setup_cpu)