diff options
| author | Fenghua Yu <fenghua.yu@intel.com> | 2011-05-17 15:33:26 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-05-17 16:36:29 -0400 |
| commit | 2494b030ba9334c7dd7df9b9f7abe4eacc950ec5 (patch) | |
| tree | 1d772a197843f9f90a040566cfe6313add367c72 /arch | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
x86, cpufeature: Fix cpuid leaf 7 feature detection
CPUID leaf 7, subleaf 0 returns the maximum subleaf in EAX, not the
number of subleaves. Since so far only subleaf 0 is defined (and only
the EBX bitfield) we do not need to qualify the test.
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Link: http://lkml.kernel.org/r/1305660806-17519-1-git-send-email-fenghua.yu@intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: <stable@kernel.org> 2.6.36..39
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index e2ced0074a45..173f3a3fa1a6 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
| @@ -565,8 +565,7 @@ void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c) | |||
| 565 | 565 | ||
| 566 | cpuid_count(0x00000007, 0, &eax, &ebx, &ecx, &edx); | 566 | cpuid_count(0x00000007, 0, &eax, &ebx, &ecx, &edx); |
| 567 | 567 | ||
| 568 | if (eax > 0) | 568 | c->x86_capability[9] = ebx; |
| 569 | c->x86_capability[9] = ebx; | ||
| 570 | } | 569 | } |
| 571 | 570 | ||
| 572 | /* AMD-defined flags: level 0x80000001 */ | 571 | /* AMD-defined flags: level 0x80000001 */ |