Commit 857d6448 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - Fix the #DE oops message string format which confused tools parsing
   crash information (Thomas Gleixner)

 - Remove an unused variable in the UV5 code which was triggering a
   build warning with clang (Mike Travis)

* tag 'x86_urgent_for_v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/uv: Remove unused variable in UV5 NMI handler
  x86/traps: Fix #DE Oops message regression
parents c4439713 081dd68c

arch/x86/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static __always_inline void __user *error_get_trap_addr(struct pt_regs *regs) 


DEFINE_IDTENTRY(exc_divide_error)

{

	do_error_trap(regs, 0, "divide_error", X86_TRAP_DE, SIGFPE,

	do_error_trap(regs, 0, "divide error", X86_TRAP_DE, SIGFPE,

		      FPE_INTDIV, error_get_trap_addr(regs));

}

arch/x86/platform/uv/uv_nmi.c

+0 −3
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ DEFINE_PER_CPU(struct uv_cpu_nmi_s, uv_cpu_nmi); 
static unsigned long uvh_nmi_mmrx;		/* UVH_EVENT_OCCURRED0/1 */

static unsigned long uvh_nmi_mmrx_clear;	/* UVH_EVENT_OCCURRED0/1_ALIAS */

static int uvh_nmi_mmrx_shift;			/* UVH_EVENT_OCCURRED0/1_EXTIO_INT0_SHFT */

static int uvh_nmi_mmrx_mask;			/* UVH_EVENT_OCCURRED0/1_EXTIO_INT0_MASK */

static char *uvh_nmi_mmrx_type;			/* "EXTIO_INT0" */



/* Non-zero indicates newer SMM NMI handler present */
@@ -247,7 +246,6 @@ static void uv_nmi_setup_mmrs(void) 
		uvh_nmi_mmrx = UVH_EVENT_OCCURRED0;

		uvh_nmi_mmrx_clear = UVH_EVENT_OCCURRED0_ALIAS;

		uvh_nmi_mmrx_shift = UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT;

		uvh_nmi_mmrx_mask = UVH_EVENT_OCCURRED0_EXTIO_INT0_MASK;

		uvh_nmi_mmrx_type = "OCRD0-EXTIO_INT0";



		uvh_nmi_mmrx_supported = UVH_EXTIO_INT0_BROADCAST;
@@ -258,7 +256,6 @@ static void uv_nmi_setup_mmrs(void) 
		uvh_nmi_mmrx = UVH_EVENT_OCCURRED1;

		uvh_nmi_mmrx_clear = UVH_EVENT_OCCURRED1_ALIAS;

		uvh_nmi_mmrx_shift = UVH_EVENT_OCCURRED1_EXTIO_INT0_SHFT;

		uvh_nmi_mmrx_mask = UVH_EVENT_OCCURRED1_EXTIO_INT0_MASK;

		uvh_nmi_mmrx_type = "OCRD1-EXTIO_INT0";



		uvh_nmi_mmrx_supported = UVH_EXTIO_INT0_BROADCAST;

CRA Git | Maintained and supported by SUSTech CRA and CCSE