diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 08:41:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 08:41:21 -0700 |
| commit | 1e2f5b598aa56c3978c2e623f72e9656a565c6c9 (patch) | |
| tree | 31b3a7555ac7c1d9a856adc0436ed9943c9cab36 /arch/x86/lguest | |
| 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 'arch/x86/lguest')
| -rw-r--r-- | arch/x86/lguest/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig index 29043d2048a..4a0890f815c 100644 --- a/arch/x86/lguest/Kconfig +++ b/arch/x86/lguest/Kconfig @@ -1,7 +1,6 @@ config LGUEST_GUEST bool "Lguest guest support" - select PARAVIRT - depends on X86_32 + depends on X86_32 && PARAVIRT select TTY select VIRTUALIZATION select VIRTIO |