Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753167AbdHJQlv (ORCPT ); Thu, 10 Aug 2017 12:41:51 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59089 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752524AbdHJQls (ORCPT ); Thu, 10 Aug 2017 12:41:48 -0400 Date: Thu, 10 Aug 2017 09:37:11 -0700 From: tip-bot for Vitaly Kuznetsov Message-ID: Cc: kys@microsoft.com, vkuznets@redhat.com, sthemmin@microsoft.com, hpa@zytor.com, sixiao@microsoft.com, torvalds@linux-foundation.org, andy.shevchenko@gmail.com, luto@kernel.org, mingo@kernel.org, Jork.Loeser@microsoft.com, linux-kernel@vger.kernel.org, haiyangz@microsoft.com, rostedt@goodmis.org, peterz@infradead.org, tglx@linutronix.de Reply-To: haiyangz@microsoft.com, rostedt@goodmis.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org, Jork.Loeser@microsoft.com, luto@kernel.org, torvalds@linux-foundation.org, sixiao@microsoft.com, andy.shevchenko@gmail.com, vkuznets@redhat.com, kys@microsoft.com, sthemmin@microsoft.com, hpa@zytor.com In-Reply-To: <20170802160921.21791-2-vkuznets@redhat.com> References: <20170802160921.21791-2-vkuznets@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/hyper-v: Include hyperv/ only when CONFIG_HYPERV is set Git-Commit-ID: 79cadff2d92bb8b1448f6dba6861d15adc3dc4cb 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 Content-Length: 2534 Lines: 64 Commit-ID: 79cadff2d92bb8b1448f6dba6861d15adc3dc4cb Gitweb: http://git.kernel.org/tip/79cadff2d92bb8b1448f6dba6861d15adc3dc4cb Author: Vitaly Kuznetsov AuthorDate: Wed, 2 Aug 2017 18:09:13 +0200 Committer: Ingo Molnar CommitDate: Thu, 10 Aug 2017 16:50:22 +0200 x86/hyper-v: Include hyperv/ only when CONFIG_HYPERV is set 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 Reviewed-by: Stephen Hemminger Cc: Andy Lutomirski Cc: Haiyang Zhang Cc: Jork Loeser Cc: K. Y. Srinivasan Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Simon Xiao Cc: Steven Rostedt Cc: Thomas Gleixner Cc: devel@linuxdriverproject.org Link: http://lkml.kernel.org/r/20170802160921.21791-2-vkuznets@redhat.com Signed-off-by: Ingo Molnar --- 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 2b58c8c..baea267 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -173,7 +173,12 @@ void hyperv_init(void); 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 void 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)