diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /include/asm-x86/required-features.h | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
Merge branch 'core/xen' into x86/xen
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 @@ | |||
| 41 | # define NEED_3DNOW 0 | 41 | # define NEED_3DNOW 0 |
| 42 | #endif | 42 | #endif |
| 43 | 43 | ||
| 44 | #if defined(CONFIG_X86_P6_NOP) || defined(CONFIG_X86_64) | ||
| 45 | # define NEED_NOPL (1<<(X86_FEATURE_NOPL & 31)) | ||
| 46 | #else | ||
| 47 | # define NEED_NOPL 0 | ||
| 48 | #endif | ||
| 49 | |||
| 44 | #ifdef CONFIG_X86_64 | 50 | #ifdef CONFIG_X86_64 |
| 45 | #define NEED_PSE 0 | 51 | #define NEED_PSE 0 |
| 46 | #define NEED_MSR (1<<(X86_FEATURE_MSR & 31)) | 52 | #define NEED_MSR (1<<(X86_FEATURE_MSR & 31)) |
| @@ -67,7 +73,7 @@ | |||
| 67 | #define REQUIRED_MASK1 (NEED_LM|NEED_3DNOW) | 73 | #define REQUIRED_MASK1 (NEED_LM|NEED_3DNOW) |
| 68 | 74 | ||
| 69 | #define REQUIRED_MASK2 0 | 75 | #define REQUIRED_MASK2 0 |
| 70 | #define REQUIRED_MASK3 0 | 76 | #define REQUIRED_MASK3 (NEED_NOPL) |
| 71 | #define REQUIRED_MASK4 0 | 77 | #define REQUIRED_MASK4 0 |
| 72 | #define REQUIRED_MASK5 0 | 78 | #define REQUIRED_MASK5 0 |
| 73 | #define REQUIRED_MASK6 0 | 79 | #define REQUIRED_MASK6 0 |