diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-07-19 07:30:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 17:37:05 -0400 |
| commit | 2d9ce177e68645945e3366cfe2d66ee3c28cd4f2 (patch) | |
| tree | a98a3a8b0f1e92f0b8f9ecb44b67bb46c3b4451a /include/asm-i386/required-features.h | |
| parent | 3e1f900bff40460d7bbab0ccd1a9efc3c70aee49 (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 'include/asm-i386/required-features.h')
| -rw-r--r-- | include/asm-i386/required-features.h | 2 |
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 @@ | |||
| 29 | # define NEED_CMOV 0 | 29 | # define NEED_CMOV 0 |
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| 32 | #ifdef CONFIG_X86_CMPXCHG64 | 32 | #ifdef CONFIG_X86_PAE |
| 33 | # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31)) | 33 | # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31)) |
| 34 | #else | 34 | #else |
| 35 | # define NEED_CX8 0 | 35 | # define NEED_CX8 0 |