summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/required-features.h
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-07-19 13:30:14 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 23:37:05 +0200
commit2d9ce177e68645945e3366cfe2d66ee3c28cd4f2 (patch)
treea98a3a8b0f1e92f0b8f9ecb44b67bb46c3b4451a /include/asm-i386/required-features.h
parentMerge git://git.linux-nfs.org/pub/linux/nfs-2.6 (diff)
downloadlinux-2d9ce177e68645945e3366cfe2d66ee3c28cd4f2.tar.xz
linux-2d9ce177e68645945e3366cfe2d66ee3c28cd4f2.zip
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 '')
-rw-r--r--include/asm-i386/required-features.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/required-features.h b/include/asm-i386/required-features.h
index 65848a007050..618feb98f9f5 100644
--- a/include/asm-i386/required-features.h
+++ b/include/asm-i386/required-features.h
@@ -29,7 +29,7 @@
# define NEED_CMOV 0
#endif
-#ifdef CONFIG_X86_CMPXCHG64
+#ifdef CONFIG_X86_PAE
# define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31))
#else
# define NEED_CX8 0