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

Merge branch 'x86/apic'
---

e018c9324a0671067a200b4b11bd52a6c05c4351
diff --cc arch/x86/include/asm/desc.h
index 400c17862870,96021e9bd202..e63cf582201f
--- a/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 */