diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:21:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:21:21 -0400 |
| commit | 9042763808c5285a1a61b45b0fe98a710a4c903c (patch) | |
| tree | 349be736a3b56a64c8835df03f127959bfc6e0e0 /include/asm-x86/cpufeature.h | |
| parent | 446d27338d3b422dd3dfe496d0f362230994d059 (diff) | |
| parent | aa3341a168883654d1b13f5931c5ed2762537831 (diff) | |
Merge branch 'x86/x2apic' into x86/core
Conflicts:
arch/x86/kernel/cpu/common_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/cpufeature.h')
| -rw-r--r-- | include/asm-x86/cpufeature.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h index 6dfa2b3f18c7..7ac4d93d20ed 100644 --- a/include/asm-x86/cpufeature.h +++ b/include/asm-x86/cpufeature.h | |||
| @@ -89,6 +89,7 @@ | |||
| 89 | #define X86_FEATURE_LFENCE_RDTSC (3*32+18) /* "" Lfence synchronizes RDTSC */ | 89 | #define X86_FEATURE_LFENCE_RDTSC (3*32+18) /* "" Lfence synchronizes RDTSC */ |
| 90 | #define X86_FEATURE_11AP (3*32+19) /* "" Bad local APIC aka 11AP */ | 90 | #define X86_FEATURE_11AP (3*32+19) /* "" Bad local APIC aka 11AP */ |
| 91 | #define X86_FEATURE_NOPL (3*32+20) /* The NOPL (0F 1F) instructions */ | 91 | #define X86_FEATURE_NOPL (3*32+20) /* The NOPL (0F 1F) instructions */ |
| 92 | #define X86_FEATURE_XTOPOLOGY (3*32+21) /* cpu topology enum extensions */ | ||
| 92 | 93 | ||
| 93 | /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ | 94 | /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ |
| 94 | #define X86_FEATURE_XMM3 (4*32+ 0) /* "pni" SSE-3 */ | 95 | #define X86_FEATURE_XMM3 (4*32+ 0) /* "pni" SSE-3 */ |