mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
- 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) -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEzv7L6UO9uDPlPSfHEsHwGGHeVUoFAl+F5C4ACgkQEsHwGGHe VUrDGg//TcwfoWvlH5sj9X+NnoTyBqr0cDiZ48lqArscKNHb1D1dSvcBq3EULdSZ cCviwohVpSW3VEE9xq+TYhP/7y0eDEhPrHGuI04rm+hxuN98zvsX65w9dJzsN2Q1 yVdB6fe/oq/fIKvEUfGoElhOOrWa60LCNBNfhKugCcfwOg9ljbB0yzXptlnUnApp C24ED0Xr9fTcO3zUfRgO4wm902ljpvC52zBhXBbhjYVgM9om+/93FXoYytqmpjFC WKD+H6iWHkQ7/joDh69+FbQoMK8yEIXEGBEngZfr8TlOIpBlSM/Gn+AwVyLZmg3r 3uFnbzkXNIyMjiGt+w7hjI2CUBwwM96xqOt6KUzSC623GejhRSV1+c+xUsOBJq5e rIUL1ZWaBHcyW5tj6Gcqj/3KzsZcvENiL17nH1qhdo+b5eQFUUgfyWyuBDx2Q9vM rvKk0mOpYdQ4wVL9cWOYErTGMtHUCg61x6+pwZbYJf/EOitnJch7S3c6dkQ9gp/3 P5jzYl9lJADp1IfcIhyaJnL12uR0F2yJ57PsdvSXOr2nuu23bENRFPU64zUL/iWd w8SFIjdPcZ3m+xOL71u2vhkmuomxG2oXnoqWdY7p3Lx2mOQ745A9HIRCyndcKS5V uqTWw3/gVk0FS7JJfLH4tOh4eFxgRpmqFYaJ1Hb+Oy8Le2/vLac= =09k+ -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
857d64485e
2 changed files with 1 additions and 4 deletions
|
@ -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));
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue