From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753630AbbIGRWO (ORCPT <rfc822;w@1wt.eu>);
	Mon, 7 Sep 2015 13:22:14 -0400
Received: from mail-pa0-f41.google.com ([209.85.220.41]:33333 "EHLO
	mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751331AbbIGRWL (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 7 Sep 2015 13:22:11 -0400
Date: Mon, 7 Sep 2015 10:22:22 -0700
From: Stephen Hemminger <stephen@networkplumber.org>
To: "K. Y. Srinivasan" <kys@microsoft.com>,
        Haiyang Zhang <haiyangz@microsoft.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] hyperv: fix build if KEXEC not enabled
Message-ID: <20150907102222.27d0477b@urahara>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Fixes regression 4.3 mergw window in my config 
where hyperv is enable but CONFIG_KEXEC not enabled.

arch/x86/kernel/cpu/mshyperv.c:112: undefined reference to `native_machine_crash_shutdown'

Introduced by:
   commit b4370df2b1f5158de028e167974263c5757b34a6
   Author: Vitaly Kuznetsov <vkuznets@redhat.com>
   Date:   Sat Aug 1 16:08:09 2015 -0700

       Drivers: hv: vmbus: add special crash handler


Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>


--- a/arch/x86/kernel/cpu/mshyperv.c	2015-09-07 10:11:24.994885115 -0700
+++ b/arch/x86/kernel/cpu/mshyperv.c	2015-09-07 10:14:20.995698615 -0700
@@ -109,7 +109,9 @@ static void hv_machine_crash_shutdown(st
 {
 	if (hv_crash_handler)
 		hv_crash_handler(regs);
+#ifdef CONFIG_KEXEC
 	native_machine_crash_shutdown(regs);
+#endif
 }