From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jun 2021 19:46:30 +0000 (-0700)
Subject: Merge tag 'x86-apic-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6999
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5a0fc4e20d3b672489efc22b515c549bb77db42;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'x86-apic-2021-06-28' of git://git./linux/kernel/git/tip/tip

Pull x86 exception handling updates from Ingo Molnar:

 - Clean up & simplify AP exception handling setup.

 - Consolidate the disjoint IDT setup code living in idt_setup_traps()
   and idt_setup_ist_traps() into a single idt_setup_traps()
   initialization function and call it before cpu_init().

* tag 'x86-apic-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/idt: Rework IDT setup for boot CPU
  x86/cpu: Init AP exception handling from cpu_init_secondary()
---

e5a0fc4e20d3b672489efc22b515c549bb77db42
diff --cc arch/x86/kernel/smpboot.c
index ec2d64a,2ed45b03..9320285
--- 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;