diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-24 20:21:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-24 20:21:47 +0200 |
| commit | 9bf8a943ad79a3bb15597fe0275f8b1cf26e2010 (patch) | |
| tree | 9d5ce8b4ccdf17a67e437d6bd1954ff20be7273c /arch/x86/xen/Kconfig | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwe... (diff) | |
| parent | xen: remove support for non-PAE 32-bit (diff) | |
| download | linux-9bf8a943ad79a3bb15597fe0275f8b1cf26e2010.tar.xz linux-9bf8a943ad79a3bb15597fe0275f8b1cf26e2010.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
xen: remove support for non-PAE 32-bit
Diffstat (limited to 'arch/x86/xen/Kconfig')
| -rw-r--r-- | arch/x86/xen/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 2e641be2737e..525b108411bd 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -6,7 +6,7 @@ config XEN bool "Xen guest support" select PARAVIRT 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 |