From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Jun 2021 19:36:59 +0000 (-0700)
Subject: Merge tag 'x86-irq-2021-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=a22c3f615a6fef6553e20c559d31ea817216b4e6;p=kernel.git

Merge tag 'x86-irq-2021-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 interrupt related updates from Thomas Gleixner:

 - Consolidate the VECTOR defines and the usage sites.

 - Cleanup GDT/IDT related code and replace open coded ASM with proper
   native helper functions.

* tag 'x86-irq-2021-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kexec: Set_[gi]dt() -> native_[gi]dt_invalidate() in machine_kexec_*.c
  x86: Add native_[ig]dt_invalidate()
  x86/idt: Remove address argument from idt_invalidate()
  x86/irq: Add and use NR_EXTERNAL_VECTORS and NR_SYSTEM_VECTORS
  x86/irq: Remove unused vectors defines
---

a22c3f615a6fef6553e20c559d31ea817216b4e6
diff --cc arch/x86/include/asm/desc.h
index 96021e9bd2022,400c178628709..e63cf582201f8
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@@ -421,10 -441,12 +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 */