[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <160261087913.7002.10262284099177006973.tip-bot2@tip-bot2>
Date: Tue, 13 Oct 2020 17:41:19 -0000
From: "tip-bot2 for Mike Travis" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Mike Travis <mike.travis@....com>, Borislav Petkov <bp@...e.de>,
x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org>
Subject: [tip: x86/urgent] x86/platform/uv: Remove unused variable in UV5 NMI handler
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 081dd68c89061077930ec7776d98837cb64b0405
Gitweb: https://git.kernel.org/tip/081dd68c89061077930ec7776d98837cb64b0405
Author: Mike Travis <mike.travis@....com>
AuthorDate: Tue, 13 Oct 2020 10:47:31 -05:00
Committer: Borislav Petkov <bp@...e.de>
CommitterDate: Tue, 13 Oct 2020 19:21:13 +02:00
x86/platform/uv: Remove unused variable in UV5 NMI handler
Remove an unused variable.
Signed-off-by: Mike Travis <mike.travis@....com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Link: https://lkml.kernel.org/r/20201013154731.132565-1-mike.travis@hpe.com
---
arch/x86/platform/uv/uv_nmi.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
index 0f5cbcf..eafc530 100644
--- a/arch/x86/platform/uv/uv_nmi.c
+++ b/arch/x86/platform/uv/uv_nmi.c
@@ -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;
Powered by blists - more mailing lists