diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 11:41:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 11:41:21 -0400 |
| commit | 1e2f5b598aa56c3978c2e623f72e9656a565c6c9 (patch) | |
| tree | 31b3a7555ac7c1d9a856adc0436ed9943c9cab36 /drivers | |
| parent | f9b3bcfbc43ac80f2019a5093ad9a1e624e611b1 (diff) | |
| parent | 4d681be3c33dd74efffbe2a8f70634f7128602ec (diff) | |
Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 paravirt update from Ingo Molnar:
"Various paravirtualization related changes - the biggest one makes
guest support optional via CONFIG_HYPERVISOR_GUEST"
* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, wakeup, sleep: Use pvops functions for changing GDT entries
x86, xen, gdt: Remove the pvops variant of store_gdt.
x86-32, gdt: Store/load GDT for ACPI S3 or hibernation/resume path is not needed
x86-64, gdt: Store/load GDT for ACPI S3 or hibernate/resume path is not needed.
x86: Make Linux guest support optional
x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hv/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 64630f15f181..0403b51d20ba 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig | |||
| @@ -2,7 +2,7 @@ menu "Microsoft Hyper-V guest support" | |||
| 2 | 2 | ||
| 3 | config HYPERV | 3 | config HYPERV |
| 4 | tristate "Microsoft Hyper-V client drivers" | 4 | tristate "Microsoft Hyper-V client drivers" |
| 5 | depends on X86 && ACPI && PCI && X86_LOCAL_APIC | 5 | depends on X86 && ACPI && PCI && X86_LOCAL_APIC && HYPERVISOR_GUEST |
| 6 | help | 6 | help |
| 7 | Select this option to run Linux as a Hyper-V client operating | 7 | Select this option to run Linux as a Hyper-V client operating |
| 8 | system. | 8 | system. |
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 3659d00efdc5..c002d8660e30 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -426,7 +426,7 @@ config TI_DAC7512 | |||
| 426 | 426 | ||
| 427 | config VMWARE_BALLOON | 427 | config VMWARE_BALLOON |
| 428 | tristate "VMware Balloon Driver" | 428 | tristate "VMware Balloon Driver" |
| 429 | depends on X86 | 429 | depends on X86 && HYPERVISOR_GUEST |
| 430 | help | 430 | help |
| 431 | This is VMware physical memory management driver which acts | 431 | This is VMware physical memory management driver which acts |
| 432 | like a "balloon" that can be inflated to reclaim physical pages | 432 | like a "balloon" that can be inflated to reclaim physical pages |