Commit-ID: ee07b34fd435b7cc5678b36dda7f6468fe6a0e55 Gitweb: http://git.kernel.org/tip/ee07b34fd435b7cc5678b36dda7f6468fe6a0e55 Author: Vitaly Kuznetsov <vkuzn...@redhat.com> AuthorDate: Tue, 22 Sep 2015 15:49:59 +0200 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Tue, 22 Sep 2015 17:25:31 +0200
x86/hyperv: Fix build for CONFIG_KEXEC_CORE=n Recent changes in the Hyper-V driver broke the build when CONFIG_KEXEC_CORE is not set: arch/x86/built-in.o: In function `hv_machine_crash_shutdown': arch/x86/kernel/cpu/mshyperv.c:112: undefined reference to `native_machine_crash_shutdown' Decorate all kexec related code with #ifdef CONFIG_KEXEC_CORE. Fixes: b4370df2b1f5: "Drivers: hv: vmbus: add special crash handler" Reported-by: Jim Davis <jim.ep...@gmail.com> Reported-by: Stephen Hemminger <step...@networkplumber.org> Signed-off-by: Vitaly Kuznetsov <vkuzn...@redhat.com> Cc: de...@linuxdriverproject.org Cc: K. Y. Srinivasan <k...@microsoft.com> Cc: Haiyang Zhang <haiya...@microsoft.com> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Link: http://lkml.kernel.org/r/1442929799-28091-1-git-send-email-vkuzn...@redhat.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- arch/x86/kernel/cpu/mshyperv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index 381c8b9..6cec20a 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -98,6 +98,7 @@ void hv_remove_crash_handler(void) EXPORT_SYMBOL_GPL(hv_remove_crash_handler); #endif +#ifdef CONFIG_KEXEC_CORE static void hv_machine_shutdown(void) { if (kexec_in_progress && hv_kexec_handler) @@ -111,7 +112,7 @@ static void hv_machine_crash_shutdown(struct pt_regs *regs) hv_crash_handler(regs); native_machine_crash_shutdown(regs); } - +#endif static uint32_t __init ms_hyperv_platform(void) { @@ -186,8 +187,10 @@ static void __init ms_hyperv_init_platform(void) no_timer_check = 1; #endif +#ifdef CONFIG_KEXEC_CORE machine_ops.shutdown = hv_machine_shutdown; machine_ops.crash_shutdown = hv_machine_crash_shutdown; +#endif mark_tsc_unstable("running on Hyper-V"); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
