summaryrefslogtreecommitdiff
path: root/arch/x86/xen/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-25 05:09:06 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-25 05:09:06 +0400
commit919c0d14ae93073a3957c018a6d86ceb1e2e454b (patch)
treeb654cfcee21adaf4842447e4fe21f74aa956bcca /arch/x86/xen/Kconfig
parentde08341a0ef747d607542af3ae441b286f503e35 (diff)
parent6b1ed9086592fd4b066daae222751bb6757ca5eb (diff)
downloadlinux-919c0d14ae93073a3957c018a6d86ceb1e2e454b.tar.xz
Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: KVM: Remove now unused structs from kvm_para.h x86: KVM guest: Use the paravirt clocksource structs and functions KVM: Make kvm host use the paravirt clocksource structs x86: Make xen use the paravirt clocksource structs and functions x86: Add structs and functions for paravirt clocksource KVM: VMX: Fix host msr corruption with preemption enabled KVM: ioapic: fix lost interrupt when changing a device's irq KVM: MMU: Fix oops on guest userspace access to guest pagetable KVM: MMU: large page update_pte issue with non-PAE 32-bit guests (resend) KVM: MMU: Fix rmap_write_protect() hugepage iteration bug KVM: close timer injection race window in __vcpu_run KVM: Fix race between timer migration and vcpu migration
Diffstat (limited to 'arch/x86/xen/Kconfig')
-rw-r--r--arch/x86/xen/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 525b108411bd..6c388e593bc8 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -5,6 +5,7 @@
config XEN
bool "Xen guest support"
select PARAVIRT
+ select PARAVIRT_CLOCK
depends on X86_32
depends on X86_CMPXCHG && X86_TSC && X86_PAE && !(X86_VISWS || X86_VOYAGER)
help