diff options
| author | Ingo Molnar | 2008-09-05 09:19:50 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-09-05 09:19:50 +0200 |
| commit | 446d27338d3b422dd3dfe496d0f362230994d059 (patch) | |
| tree | 3452a8c7c487675020b2a2137635bc7dfede57fe /include/asm-x86/processor.h | |
| parent | Merge branch 'x86/xsave' into x86/core (diff) | |
| parent | x86: move 32bit related functions together (diff) | |
| download | kernel-qcow2-linux-446d27338d3b422dd3dfe496d0f362230994d059.tar.gz kernel-qcow2-linux-446d27338d3b422dd3dfe496d0f362230994d059.tar.xz kernel-qcow2-linux-446d27338d3b422dd3dfe496d0f362230994d059.zip | |
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 { __u8 x86_phys_bits; /* CPUID returned core id bits: */ __u8 x86_coreid_bits; +#endif /* Max extended CPUID function supported: */ __u32 extended_cpuid_level; -#endif /* Maximum supported CPUID level, -1=no CPUID: */ int cpuid_level; __u32 x86_capability[NCAPINTS]; |