Commit 27743f01 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@kernel.org>
Cc: Mike Travis <travis@sgi.com>
Cc: linux-kernel@vger.kernel.org
parent c2209ea5

arch/x86/platform/uv/uv_nmi.c

+2 −11
Original line number Diff line number Diff line
@@ -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)