Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751985AbdFYRJW (ORCPT ); Sun, 25 Jun 2017 13:09:22 -0400 Received: from a2nlsmtp01-03.prod.iad2.secureserver.net ([198.71.225.37]:34370 "EHLO a2nlsmtp01-03.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbdFYRHw (ORCPT ); Sun, 25 Jun 2017 13:07:52 -0400 x-originating-ip: 107.180.71.197 From: kys@exchange.microsoft.com To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com, leann.ogasawara@canonical.com, marcelo.cerri@canonical.com, sthemmin@microsoft.com Cc: "K. Y. Srinivasan" Subject: [PATCH 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set Date: Sun, 25 Jun 2017 10:06:40 -0700 Message-Id: <1498410409-30997-1-git-send-email-kys@exchange.microsoft.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1498410380-30955-1-git-send-email-kys@exchange.microsoft.com> References: <1498410380-30955-1-git-send-email-kys@exchange.microsoft.com> Reply-To: kys@microsoft.com X-CMAE-Envelope: MS4wfJ/TFi0fV3K0NGQ4C5WJNM/GrcVZqlW3xuljX+IzrtnGSjzFq2aDW3L2RQ1XoOZkzhuSFHFgE5iq2qUlva0YqcAyliCTw7kyUB3HIxWiT7bJanC9LTje S/yMbK9Ppzo/qbZu0nszEEG1WJCmdM16NAMVsGoVsfdS8CtbDSLtNPnq/T+/bVkTAVOX3mfgT4+KihaIs6mlZRKK4/oVo8VsKW4NS9ZkouzbaZqAGazPQywx H4bNH1BCDgQBW1+X3lHiFsHSsg/2SyqF7InKf1U/Ek6mLv/phryBxYCOCl4RGMjHRpMulINUfbFMBPCLBFwrjFNIVBmfKGJAt5d+lZfLBlFxnnvhdxVIE7uF NN3toyN33rqDta8U/cbV/G6a2c1s8OKXEnCXjjkPG6Um8WxkACgqrZ9TZK8Q7irTazyV3lf3JiwbTo+I0i0U/7ipKKfys4JXPkwGtbUl+19jQDKJHqRQGvj8 kj45QnxjFMjWQz6uRct34ai7j+zm2XrvUYkwObuts7PO5ezgvU3dIBEg8QGUpDT3KEktG91nzsV4EYAq Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1734 Lines: 47 From: Vitaly Kuznetsov Code is arch/x86/hyperv/ is only needed when CONFIG_HYPERV is set, the 'basic' support and detection lives in arch/x86/kernel/cpu/mshyperv.c which is included when CONFIG_HYPERVISOR_GUEST is set. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Andy Shevchenko Signed-off-by: K. Y. Srinivasan --- arch/x86/Kbuild | 2 +- arch/x86/include/asm/mshyperv.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 586b786..3e6f640 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -8,7 +8,7 @@ obj-$(CONFIG_KVM) += kvm/ obj-$(CONFIG_XEN) += xen/ # Hyper-V paravirtualization support -obj-$(CONFIG_HYPERVISOR_GUEST) += hyperv/ +obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/ # lguest paravirtualization support obj-$(CONFIG_LGUEST_GUEST) += lguest/ diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index 18325dc..66f9f2a 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -174,7 +174,12 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type) void hyperv_report_panic(struct pt_regs *regs); bool hv_is_hypercall_page_setup(void); void hyperv_cleanup(void); -#endif +#else /* CONFIG_HYPERV */ +static inline void hyperv_init(void) {} +static inline bool hv_is_hypercall_page_setup(void) { return false; } +static inline hyperv_cleanup(void) {} +#endif /* CONFIG_HYPERV */ + #ifdef CONFIG_HYPERV_TSCPAGE struct ms_hyperv_tsc_page *hv_get_tsc_page(void); static inline u64 hv_read_tsc_page(const struct ms_hyperv_tsc_page *tsc_pg) -- 1.7.1