From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 2 Jun 2021 06:03:44 +0000 (+0200)
Subject: Merge branch 'sched/core'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b35c9a23394ce32175e2b5502248d55fdab35c80;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'sched/core'
---

b35c9a23394ce32175e2b5502248d55fdab35c80
diff --cc arch/x86/kernel/smpboot.c
index 2ed45b036629,0936f5ba3222..9320285a5e29
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -232,10 -232,10 +232,9 @@@ static void notrace start_secondary(voi
  	load_cr3(swapper_pg_dir);
  	__flush_tlb_all();
  #endif
 -	cpu_init_exception_handling();
 -	cpu_init();
 +	cpu_init_secondary();
  	rcu_cpu_starting(raw_smp_processor_id());
  	x86_cpuinit.early_percpu_clock_init();
- 	preempt_disable();
  	smp_callin();
  
  	enable_start_cpu0 = 0;