From: Kirtikar Kashyap Date: Mon, 30 Oct 2017 23:19:10 +0000 (-0700) Subject: x86/platform/uv: Fix kdump for UV X-Git-Tag: v4.1.12-117.0_27200813_3~116 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e10b5e3d5659105da2c0f0c5cb7bda5458f9bbb8;p=users%2Fjedix%2Flinux-maple.git x86/platform/uv: Fix kdump for UV With uv_nmi.action=kdump on the boot line, "power nmi" does not kdump. Instead it produces backtraces (the default "dump" action). One line from upstream commit 2965faa5e03d ("kexec: split kexec_load syscall from kexec core code") was inadvertantly applied to arch/x86/platform/uv/uv_nmi.c, but the rest of the commit is missing. The UEK kernel does not have any of the other CONFIG_KEXEC_CORE related changes in it, so this breaks uv_nmi Orabug: 27031345 Signed-off-by: Kirtikar Kashyap Reviewed-by: Brian Maly --- diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c index 5b187dc14405..cd5609c8681d 100644 --- a/arch/x86/platform/uv/uv_nmi.c +++ b/arch/x86/platform/uv/uv_nmi.c @@ -498,7 +498,7 @@ static void uv_nmi_touch_watchdogs(void) static atomic_t uv_nmi_kexec_failed; -#if defined(CONFIG_KEXEC_CORE) +#if defined(CONFIG_KEXEC) static void uv_nmi_kdump(int cpu, int master, struct pt_regs *regs) { /* Call crash to dump system state */