aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-07-19 07:30:14 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 17:37:05 -0400
commit2d9ce177e68645945e3366cfe2d66ee3c28cd4f2 (patch)
treea98a3a8b0f1e92f0b8f9ecb44b67bb46c3b4451a /arch
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')
-rw-r--r--arch/i386/Kconfig.cpu5
-rw-r--r--arch/i386/defconfig1
-rw-r--r--arch/um/defconfig1
3 files changed, 0 insertions, 7 deletions
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu
index 9cbe76c3aa35..11a24d54f27b 100644
--- a/arch/i386/Kconfig.cpu
+++ b/arch/i386/Kconfig.cpu
@@ -297,11 +297,6 @@ config X86_POPAD_OK
297 depends on !M386 297 depends on !M386
298 default y 298 default y
299 299
300config X86_CMPXCHG64
301 bool
302 depends on X86_PAE
303 default y
304
305config X86_ALIGNMENT_16 300config X86_ALIGNMENT_16
306 bool 301 bool
307 depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 302 depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 1a3a2217b7c2..0ac62cdcd3b7 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -166,7 +166,6 @@ CONFIG_X86_WP_WORKS_OK=y
166CONFIG_X86_INVLPG=y 166CONFIG_X86_INVLPG=y
167CONFIG_X86_BSWAP=y 167CONFIG_X86_BSWAP=y
168CONFIG_X86_POPAD_OK=y 168CONFIG_X86_POPAD_OK=y
169CONFIG_X86_CMPXCHG64=y
170CONFIG_X86_GOOD_APIC=y 169CONFIG_X86_GOOD_APIC=y
171CONFIG_X86_INTEL_USERCOPY=y 170CONFIG_X86_INTEL_USERCOPY=y
172CONFIG_X86_USE_PPRO_CHECKSUM=y 171CONFIG_X86_USE_PPRO_CHECKSUM=y
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
52CONFIG_X86_INVLPG=y 52CONFIG_X86_INVLPG=y
53CONFIG_X86_BSWAP=y 53CONFIG_X86_BSWAP=y
54CONFIG_X86_POPAD_OK=y 54CONFIG_X86_POPAD_OK=y
55CONFIG_X86_CMPXCHG64=y
56CONFIG_X86_GOOD_APIC=y 55CONFIG_X86_GOOD_APIC=y
57CONFIG_X86_USE_PPRO_CHECKSUM=y 56CONFIG_X86_USE_PPRO_CHECKSUM=y
58CONFIG_X86_TSC=y 57CONFIG_X86_TSC=y