From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758195AbbIVP1y (ORCPT ); Tue, 22 Sep 2015 11:27:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50922 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752470AbbIVP1w (ORCPT ); Tue, 22 Sep 2015 11:27:52 -0400 Date: Tue, 22 Sep 2015 08:27:31 -0700 From: tip-bot for Vitaly Kuznetsov Message-ID: Cc: mingo@kernel.org, haiyangz@microsoft.com, kys@microsoft.com, vkuznets@redhat.com, tglx@linutronix.de, gregkh@linuxfoundation.org, jim.epost@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, stephen@networkplumber.org Reply-To: hpa@zytor.com, gregkh@linuxfoundation.org, jim.epost@gmail.com, stephen@networkplumber.org, linux-kernel@vger.kernel.org, vkuznets@redhat.com, tglx@linutronix.de, kys@microsoft.com, haiyangz@microsoft.com, mingo@kernel.org In-Reply-To: <1442929799-28091-1-git-send-email-vkuznets@redhat.com> References: <1442929799-28091-1-git-send-email-vkuznets@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/hyperv: Fix build for CONFIG_KEXEC_CORE=n Git-Commit-ID: ee07b34fd435b7cc5678b36dda7f6468fe6a0e55 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ee07b34fd435b7cc5678b36dda7f6468fe6a0e55 Gitweb: http://git.kernel.org/tip/ee07b34fd435b7cc5678b36dda7f6468fe6a0e55 Author: Vitaly Kuznetsov AuthorDate: Tue, 22 Sep 2015 15:49:59 +0200 Committer: Thomas Gleixner 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 Reported-by: Stephen Hemminger Signed-off-by: Vitaly Kuznetsov Cc: devel@linuxdriverproject.org Cc: K. Y. Srinivasan Cc: Haiyang Zhang Cc: Greg Kroah-Hartman Link: http://lkml.kernel.org/r/1442929799-28091-1-git-send-email-vkuznets@redhat.com Signed-off-by: Thomas Gleixner --- 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"); }