diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-24 14:21:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-24 14:21:47 -0400 |
| commit | 9bf8a943ad79a3bb15597fe0275f8b1cf26e2010 (patch) | |
| tree | 9d5ce8b4ccdf17a67e437d6bd1954ff20be7273c /arch/x86/xen/Kconfig | |
| parent | 3b968b7c10b3d81eb83380655484f2bb5b240dc6 (diff) | |
| parent | 28499143933f19b28008a556ed59255d6009391a (diff) | |
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 | |||
| 6 | bool "Xen guest support" | 6 | bool "Xen guest support" |
| 7 | select PARAVIRT | 7 | select PARAVIRT |
| 8 | depends on X86_32 | 8 | depends on X86_32 |
| 9 | depends on X86_CMPXCHG && X86_TSC && !(X86_VISWS || X86_VOYAGER) | 9 | depends on X86_CMPXCHG && X86_TSC && X86_PAE && !(X86_VISWS || X86_VOYAGER) |
| 10 | help | 10 | help |
| 11 | This is the Linux Xen port. Enabling this will allow the | 11 | This is the Linux Xen port. Enabling this will allow the |
| 12 | kernel to boot in a paravirtualized environment under the | 12 | kernel to boot in a paravirtualized environment under the |