diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:19:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:19:50 -0400 |
commit | 446d27338d3b422dd3dfe496d0f362230994d059 (patch) | |
tree | 3452a8c7c487675020b2a2137635bc7dfede57fe /include/asm-x86/processor.h | |
parent | accf0fa697eeb5ff4c2360edc4da5b10abac0b7b (diff) | |
parent | 0a488a53d7ca46ac638c30079072c57e50cfcc7b (diff) |
Merge branch 'x86/cpu' into x86/core
Diffstat (limited to 'include/asm-x86/processor.h')
-rw-r--r-- | include/asm-x86/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index df03c98e38d4..ae5bd1abe766 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h | |||
@@ -77,9 +77,9 @@ struct cpuinfo_x86 { | |||
77 | __u8 x86_phys_bits; | 77 | __u8 x86_phys_bits; |
78 | /* CPUID returned core id bits: */ | 78 | /* CPUID returned core id bits: */ |
79 | __u8 x86_coreid_bits; | 79 | __u8 x86_coreid_bits; |
80 | #endif | ||
80 | /* Max extended CPUID function supported: */ | 81 | /* Max extended CPUID function supported: */ |
81 | __u32 extended_cpuid_level; | 82 | __u32 extended_cpuid_level; |
82 | #endif | ||
83 | /* Maximum supported CPUID level, -1=no CPUID: */ | 83 | /* Maximum supported CPUID level, -1=no CPUID: */ |
84 | int cpuid_level; | 84 | int cpuid_level; |
85 | __u32 x86_capability[NCAPINTS]; | 85 | __u32 x86_capability[NCAPINTS]; |