summaryrefslogtreecommitdiff
path: root/arch/um/defconfig
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-07-19 14:30:14 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 14:37:05 -0700
commit2d9ce177e68645945e3366cfe2d66ee3c28cd4f2 (patch)
treea98a3a8b0f1e92f0b8f9ecb44b67bb46c3b4451a /arch/um/defconfig
parent3e1f900bff40460d7bbab0ccd1a9efc3c70aee49 (diff)
i386: Allow KVM on i386 nonpae
Currently, CONFIG_X86_CMPXCHG64 both enables boot-time checking of the cmpxchg64b feature and enables compilation of the set_64bit() family. Since the option is dependent on PAE, and since KVM depends on set_64bit(), this effectively disables KVM on i386 nopae. Simplify by removing the config option altogether: the boot check is made dependent on CONFIG_X86_PAE directly, and the set_64bit() family is exposed without constraints. It is up to users to check for the feature flag (KVM does not as virtualiation extensions imply its existence). Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/defconfig')
-rw-r--r--arch/um/defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/defconfig b/arch/um/defconfig
index a25cd25d55d4..1e0f677c2f46 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -52,7 +52,6 @@ CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
-CONFIG_X86_CMPXCHG64=y
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_TSC=y