Commit f71194a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Peter Anvin:
 "This series fixes a couple of build failures, and fixes MTRR cleanup
  and memory setup on very specific memory maps.

  Finally, it fixes triggering backtraces on all CPUs, which was
  inadvertently disabled on x86."

* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/efi: Fix dummy variable buffer allocation
  x86: Fix trigger_all_cpu_backtrace() implementation
  x86: Fix section mismatch on load_ucode_ap
  x86: fix build error and kconfig for ia32_emulation and binfmt
  range: Do not add new blank slot with add_range_with_merge
  x86, mtrr: Fix original mtrr range get for mtrr_cleanup
parents e61cd5e2 df91c351

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2265,6 +2265,7 @@ source "fs/Kconfig.binfmt" 
config IA32_EMULATION

	bool "IA32 Emulation"

	depends on X86_64

	select BINFMT_ELF

	select COMPAT_BINFMT_ELF

	select HAVE_UID16

	---help---

arch/x86/include/asm/irq.h

+5 −0
Original line number Diff line number Diff line
@@ -41,4 +41,9 @@ extern int vector_used_by_percpu_irq(unsigned int vector); 


extern void init_ISA_irqs(void);



#ifdef CONFIG_X86_LOCAL_APIC

void arch_trigger_all_cpu_backtrace(void);

#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace

#endif



#endif /* _ASM_X86_IRQ_H */

arch/x86/include/asm/microcode.h

+2 −2
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ static inline void __exit exit_amd_microcode(void) {} 
#ifdef CONFIG_MICROCODE_EARLY

#define MAX_UCODE_COUNT 128

extern void __init load_ucode_bsp(void);

extern __init void load_ucode_ap(void);

extern void __cpuinit load_ucode_ap(void);

extern int __init save_microcode_in_initrd(void);

#else

static inline void __init load_ucode_bsp(void) {}

static inline __init void load_ucode_ap(void) {}

static inline void __cpuinit load_ucode_ap(void) {}

static inline int __init save_microcode_in_initrd(void)

{

	return 0;

arch/x86/include/asm/nmi.h

+1 −3
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ extern int proc_nmi_enabled(struct ctl_table *, int , 
			void __user *, size_t *, loff_t *);

extern int unknown_nmi_panic;



void arch_trigger_all_cpu_backtrace(void);

#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace

#endif

#endif /* CONFIG_X86_LOCAL_APIC */



#define NMI_FLAG_FIRST	1

arch/x86/kernel/apic/hw_nmi.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 *

 */

#include <asm/apic.h>

#include <asm/nmi.h>



#include <linux/cpumask.h>

#include <linux/kdebug.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE