diff options
| author | Ingo Molnar | 2008-09-14 17:23:29 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-09-14 17:23:29 +0200 |
| commit | 9dfed08eb4086584205717894177a9ee930c88c4 (patch) | |
| tree | 3455b242f0e85a86d836858a86bd6ffd21279e22 /include/asm-x86/required-features.h | |
| parent | IO resources: fix/remove printk (diff) | |
| parent | Linux 2.6.27-rc6 (diff) | |
| download | kernel-qcow2-linux-9dfed08eb4086584205717894177a9ee930c88c4.tar.gz kernel-qcow2-linux-9dfed08eb4086584205717894177a9ee930c88c4.tar.xz kernel-qcow2-linux-9dfed08eb4086584205717894177a9ee930c88c4.zip | |
Merge commit 'v2.6.27-rc6' into core/resources
Diffstat (limited to 'include/asm-x86/required-features.h')
| -rw-r--r-- | include/asm-x86/required-features.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-x86/required-features.h b/include/asm-x86/required-features.h index adec887dd7cd..5c2ff4bc2980 100644 --- a/include/asm-x86/required-features.h +++ b/include/asm-x86/required-features.h @@ -41,6 +41,12 @@ # define NEED_3DNOW 0 #endif +#if defined(CONFIG_X86_P6_NOP) || defined(CONFIG_X86_64) +# define NEED_NOPL (1<<(X86_FEATURE_NOPL & 31)) +#else +# define NEED_NOPL 0 +#endif + #ifdef CONFIG_X86_64 #define NEED_PSE 0 #define NEED_MSR (1<<(X86_FEATURE_MSR & 31)) @@ -67,7 +73,7 @@ #define REQUIRED_MASK1 (NEED_LM|NEED_3DNOW) #define REQUIRED_MASK2 0 -#define REQUIRED_MASK3 0 +#define REQUIRED_MASK3 (NEED_NOPL) #define REQUIRED_MASK4 0 #define REQUIRED_MASK5 0 #define REQUIRED_MASK6 0 |