diff options
author | Borislav Petkov <bp@suse.de> | 2013-03-04 15:20:21 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-03-04 16:14:25 -0500 |
commit | 6276a074c6519946c527f03e2ab69770a62652d9 (patch) | |
tree | 29527fb4e5a6c4f3089d82643616465d85697530 /drivers/misc | |
parent | 2c59cad6941cb55990fa6e19d84ae027c46991ee (diff) |
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/misc')
-rw-r--r-- | drivers/misc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index e83fdfe0c8ca..891123e31932 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -418,7 +418,7 @@ config TI_DAC7512 | |||
418 | 418 | ||
419 | config VMWARE_BALLOON | 419 | config VMWARE_BALLOON |
420 | tristate "VMware Balloon Driver" | 420 | tristate "VMware Balloon Driver" |
421 | depends on X86 | 421 | depends on X86 && HYPERVISOR_GUEST |
422 | help | 422 | help |
423 | This is VMware physical memory management driver which acts | 423 | This is VMware physical memory management driver which acts |
424 | like a "balloon" that can be inflated to reclaim physical pages | 424 | like a "balloon" that can be inflated to reclaim physical pages |