diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-07-19 14:30:14 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 14:37:05 -0700 |
| commit | 2d9ce177e68645945e3366cfe2d66ee3c28cd4f2 (patch) | |
| tree | a98a3a8b0f1e92f0b8f9ecb44b67bb46c3b4451a /arch/i386 | |
| parent | 3e1f900bff40460d7bbab0ccd1a9efc3c70aee49 (diff) | |
| download | blackbird-op-linux-2d9ce177e68645945e3366cfe2d66ee3c28cd4f2.tar.gz blackbird-op-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 'arch/i386')
| -rw-r--r-- | arch/i386/Kconfig.cpu | 5 | ||||
| -rw-r--r-- | arch/i386/defconfig | 1 |
2 files changed, 0 insertions, 6 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 depends on !M386 default y -config X86_CMPXCHG64 - bool - depends on X86_PAE - default y - config X86_ALIGNMENT_16 bool 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 CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_CMPXCHG64=y CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y |
