[tip:,x86/platform] x86/platform/uv: Remove dead !CONFIG_KEXEC_CORE code
diff mbox series

Message ID 161890839197.29796.11895612342137969133.tip-bot2@tip-bot2
State Accepted
Commit 27743f01e391ee1d80e3be2a09237507b965f91b
Headers show
Series
  • [tip:,x86/platform] x86/platform/uv: Remove dead !CONFIG_KEXEC_CORE code
Related show

Commit Message

tip-bot2 for Brijesh Singh April 20, 2021, 8:46 a.m. UTC
The following commit has been merged into the x86/platform branch of tip:

Commit-ID:     27743f01e391ee1d80e3be2a09237507b965f91b
Gitweb:        https://git.kernel.org/tip/27743f01e391ee1d80e3be2a09237507b965f91b
Author:        Ingo Molnar <mingo@kernel.org>
AuthorDate:    Tue, 20 Apr 2021 10:03:02 +02:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 20 Apr 2021 10:08:34 +02:00

x86/platform/uv: Remove dead !CONFIG_KEXEC_CORE code

The !CONFIG_KEXEC_CORE code in arch/x86/platform/uv/uv_nmi.c was unused, untested
and didn't even build for 7 years. Since we fixed this by requiring X86_UV to
depend on CONFIG_KEXEC_CORE, remove the (now) dead code.

Also move the uv_nmi_kexec_failed definition back up to where the other file-scope
global variables are defined.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Mike Travis <travis@sgi.com>
Cc: linux-kernel@vger.kernel.org
---
 arch/x86/platform/uv/uv_nmi.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

Patch
diff mbox series

diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
index f83810f..1556108 100644
--- a/arch/x86/platform/uv/uv_nmi.c
+++ b/arch/x86/platform/uv/uv_nmi.c
@@ -92,6 +92,8 @@  static atomic_t uv_nmi_cpus_in_nmi = ATOMIC_INIT(-1);
 static atomic_t uv_nmi_slave_continue;
 static cpumask_var_t uv_nmi_cpu_mask;
 
+static atomic_t uv_nmi_kexec_failed;
+
 /* Values for uv_nmi_slave_continue */
 #define SLAVE_CLEAR	0
 #define SLAVE_CONTINUE	1
@@ -835,8 +837,6 @@  static void uv_nmi_touch_watchdogs(void)
 	touch_nmi_watchdog();
 }
 
-#if defined(CONFIG_KEXEC_CORE)
-static atomic_t uv_nmi_kexec_failed;
 static void uv_nmi_kdump(int cpu, int main, struct pt_regs *regs)
 {
 	/* Check if kdump kernel loaded for both main and secondary CPUs */
@@ -867,15 +867,6 @@  static void uv_nmi_kdump(int cpu, int main, struct pt_regs *regs)
 	}
 }
 
-#else /* !CONFIG_KEXEC_CORE */
-static inline void uv_nmi_kdump(int cpu, int main, struct pt_regs *regs)
-{
-	if (main)
-		pr_err("UV: NMI kdump: KEXEC not supported in this kernel\n");
-	atomic_set(&uv_nmi_kexec_failed, 1);
-}
-#endif /* !CONFIG_KEXEC_CORE */
-
 #ifdef CONFIG_KGDB
 #ifdef CONFIG_KGDB_KDB
 static inline int uv_nmi_kdb_reason(void)