Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Mar 2018 17:50:30 +0000 (07:50 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Mar 2018 17:50:30 +0000 (07:50 -1000)
Pull x86 fixes from Ingo Molnar:
 "Two UV platform fixes, and a kbuild fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/UV: Fix critical UV MMR address error
  x86/platform/uv/BAU: Add APIC idt entry
  x86/purgatory: Avoid creating stray .<pid>.d files, remove -MD from KBUILD_CFLAGS

1  2 
arch/x86/kernel/idt.c

diff --combined arch/x86/kernel/idt.c
index 50bee5fe114013622ee858e4a3b7b16d1ffa8a05,5d039c848bd9f4371fe85650d79c603a9f51d925..2c3a1b4294eb40d202b4e14435cf3682b9f34d5e
@@@ -140,6 -140,9 +140,9 @@@ static const __initconst struct idt_dat
  # ifdef CONFIG_IRQ_WORK
        INTG(IRQ_WORK_VECTOR,           irq_work_interrupt),
  # endif
+ #ifdef CONFIG_X86_UV
+       INTG(UV_BAU_MESSAGE,            uv_bau_message_intr1),
+ #endif
        INTG(SPURIOUS_APIC_VECTOR,      spurious_interrupt),
        INTG(ERROR_APIC_VECTOR,         error_interrupt),
  #endif
@@@ -160,6 -163,7 +163,6 @@@ static const __initconst struct idt_dat
   */
  static const __initconst struct idt_data dbg_idts[] = {
        INTG(X86_TRAP_DB,       debug),
 -      INTG(X86_TRAP_BP,       int3),
  };
  #endif
  
@@@ -182,6 -186,7 +185,6 @@@ gate_desc debug_idt_table[IDT_ENTRIES] 
  static const __initconst struct idt_data ist_idts[] = {
        ISTG(X86_TRAP_DB,       debug,          DEBUG_STACK),
        ISTG(X86_TRAP_NMI,      nmi,            NMI_STACK),
 -      SISTG(X86_TRAP_BP,      int3,           DEBUG_STACK),
        ISTG(X86_TRAP_DF,       double_fault,   DOUBLEFAULT_STACK),
  #ifdef CONFIG_X86_MCE
        ISTG(X86_TRAP_MC,       &machine_check, MCE_STACK),