Merge branch 'x86/apic'

diff --cc arch/x86/include/asm/desc.h
index 400c1786287094c66c6e90e673f13bbe26993b69,96021e9bd202223f8795551810339739ba72a2b8..e63cf582201f8d74abd2238aded53c97ef605052
--- 1/arch/x86/include/asm/desc.h
--- 2/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@@ -441,12 -421,10 +441,10 @@@ extern bool idt_is_f00f_address(unsigne
  
  #ifdef CONFIG_X86_64
  extern void idt_setup_early_pf(void);
- extern void idt_setup_ist_traps(void);
  #else
  static inline void idt_setup_early_pf(void) { }
- static inline void idt_setup_ist_traps(void) { }
  #endif
  
 -extern void idt_invalidate(void *addr);
 +extern void idt_invalidate(void);
  
  #endif /* _ASM_X86_DESC_H */

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/idt.c
Simple merge