Drivers: hv: Make CONFIG_HYPERV bool

With CONFIG_HYPERV and CONFIG_HYPERV_VMBUS separated, change CONFIG_HYPERV
to bool from tristate. CONFIG_HYPERV now becomes the core Hyper-V
hypervisor support, such as hypercalls, clocks/timers, Confidential
Computing setup, PCI passthru, etc. that doesn't involve VMBus or VMBus
devices.

Signed-off-by: Mukesh Rathor <mrathor@linux.microsoft.com>
Signed-off-by: Wei Liu <wei.liu@kernel.org>

diff --git a/drivers/Makefile b/drivers/Makefile
index b5749cf67044ce1963ad3314090643460f5cf2b3..7ad5744db0b633a4047f8dead0e8c69822cd0b55 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -161,7 +161,7 @@ obj-$(CONFIG_SOUNDWIRE)             += soundwire/
 
 # Virtualization drivers
 obj-$(CONFIG_VIRT_DRIVERS)     += virt/
-obj-$(subst m,y,$(CONFIG_HYPERV))      += hv/
+obj-$(CONFIG_HYPERV)           += hv/
 
 obj-$(CONFIG_PM_DEVFREQ)       += devfreq/
 obj-$(CONFIG_EXTCON)           += extcon/

diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig
index 29f8637f441a680661afe9aafc0f79dd5a029672..0b8c391a03424b27c13575dfd9e2df3844bd215b 100644 (file)
--- a/drivers/hv/Kconfig
+++ b/drivers/hv/Kconfig
@@ -3,7 +3,7 @@
 menu "Microsoft Hyper-V guest support"
 
 config HYPERV
-       tristate "Microsoft Hyper-V client drivers"
+       bool "Microsoft Hyper-V core hypervisor support"
        depends on (X86 && X86_LOCAL_APIC && HYPERVISOR_GUEST) \
                || (ARM64 && !CPU_BIG_ENDIAN)
        select PARAVIRT

diff --git a/drivers/hv/Makefile b/drivers/hv/Makefile
index 4bb41663767db4fadd7c0bc0c5474f59371bfb24..1a1677bf4dacaffe4ac4c403f59b51c987527ffe 100644 (file)
--- a/drivers/hv/Makefile
+++ b/drivers/hv/Makefile
@@ -16,5 +16,5 @@ mshv_root-y := mshv_root_main.o mshv_synic.o mshv_eventfd.o mshv_irq.o \
               mshv_root_hv_call.o mshv_portid_table.o
 
 # Code that must be built-in
-obj-$(subst m,y,$(CONFIG_HYPERV)) += hv_common.o
+obj-$(CONFIG_HYPERV) += hv_common.o
 obj-$(subst m,y,$(CONFIG_MSHV_ROOT)) += hv_proc.o mshv_common.o