diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 23:29:34 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 23:29:34 +0200 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /arch/x86/xen/Kconfig | |
| parent | IB/umad: BKL is not needed for ib_umad_open() (diff) | |
| parent | Linux 2.6.26 (diff) | |
| download | linux-2fceef397f9880b212a74c418290ce69e7ac00eb.tar.xz linux-2fceef397f9880b212a74c418290ce69e7ac00eb.zip | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'arch/x86/xen/Kconfig')
| -rw-r--r-- | arch/x86/xen/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 2e641be2737e..6c388e593bc8 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -5,8 +5,9 @@ config XEN bool "Xen guest support" select PARAVIRT + select PARAVIRT_CLOCK depends on X86_32 - depends on X86_CMPXCHG && X86_TSC && !(X86_VISWS || X86_VOYAGER) + depends on X86_CMPXCHG && X86_TSC && X86_PAE && !(X86_VISWS || X86_VOYAGER) help This is the Linux Xen port. Enabling this will allow the kernel to boot in a paravirtualized environment under the |