diff options
| -rw-r--r-- | arch/x86/Kbuild | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/mshyperv.h | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 3e6f64073005..586b786b3edf 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-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/ +obj-$(CONFIG_HYPERVISOR_GUEST) += 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 01b9c0fb3aab..58b9291b46d8 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -175,12 +175,7 @@ void hyperv_init(void); void hyperv_report_panic(struct pt_regs *regs); bool hv_is_hypercall_page_setup(void); void hyperv_cleanup(void); -#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 */ - +#endif #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) |