summaryrefslogtreecommitdiff
path: root/drivers/hv
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2013-03-04 20:20:21 (GMT)
committerH. Peter Anvin <hpa@linux.intel.com>2013-03-04 21:14:25 (GMT)
commit6276a074c6519946c527f03e2ab69770a62652d9 (patch)
tree29527fb4e5a6c4f3089d82643616465d85697530 /drivers/hv
parent2c59cad6941cb55990fa6e19d84ae027c46991ee (diff)
downloadlinux-6276a074c6519946c527f03e2ab69770a62652d9.tar.xz
x86: Make Linux guest support optional
Put all config options needed to run Linux as a guest behind a CONFIG_HYPERVISOR_GUEST menu so that they don't get built-in by default but be selectable by the user. Also, make all units which depend on x86_hyper, depend on this new symbol so that compilation doesn't fail when CONFIG_HYPERVISOR_GUEST is disabled but those units assume its presence. Sort options in the new HYPERVISOR_GUEST menu, adapt config text and drop redundant select. Signed-off-by: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/1362428421-9244-3-git-send-email-bp@alien8.de Cc: Dmitry Torokhov <dtor@vmware.com> Cc: K. Y. Srinivasan <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers/hv')
-rw-r--r--drivers/hv/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig
index 64630f1..0403b51 100644
--- a/drivers/hv/Kconfig
+++ b/drivers/hv/Kconfig
@@ -2,7 +2,7 @@ menu "Microsoft Hyper-V guest support"
config HYPERV
tristate "Microsoft Hyper-V client drivers"
- depends on X86 && ACPI && PCI && X86_LOCAL_APIC
+ depends on X86 && ACPI && PCI && X86_LOCAL_APIC && HYPERVISOR_GUEST
help
Select this option to run Linux as a Hyper-V client operating
system.