Commit-ID: 79cadff2d92bb8b1448f6dba6861d15adc3dc4cb Gitweb: http://git.kernel.org/tip/79cadff2d92bb8b1448f6dba6861d15adc3dc4cb Author: Vitaly Kuznetsov <vkuzn...@redhat.com> AuthorDate: Wed, 2 Aug 2017 18:09:13 +0200 Committer: Ingo Molnar <mi...@kernel.org> 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 <vkuzn...@redhat.com> Reviewed-by: Andy Shevchenko <andy.shevche...@gmail.com> Reviewed-by: Stephen Hemminger <sthem...@microsoft.com> Cc: Andy Lutomirski <l...@kernel.org> Cc: Haiyang Zhang <haiya...@microsoft.com> Cc: Jork Loeser <jork.loe...@microsoft.com> Cc: K. Y. Srinivasan <k...@microsoft.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Simon Xiao <six...@microsoft.com> Cc: Steven Rostedt <rost...@goodmis.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: de...@linuxdriverproject.org Link: http://lkml.kernel.org/r/20170802160921.21791-2-vkuzn...@redhat.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- 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)
