openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: fix typo in filter_cpuid_features() 

Impact: fix wrong disabling of cpu features

an amd system got this strange output:

 CPU: CPU feature monitor disabled due to lack of CPUID level 0x5

but in /proc/cpuinfo I have:

 cpuid level	: 5

on intel system:

 CPU: CPU feature monitor disabled due to lack of CPUID level 0x5
 CPU: CPU feature dca disabled due to lack of CPUID level 0x9

but in /proc/cpuinfo i have:

 cpuid level     : 11

Tt turns out there is a typo, and we should use level member in df.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2009-02-14 23:59:18 -08:00 committed by Ingo Molnar
parent b38b066590
commit f6db44df5b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/cpu/common.c
View File

@ -241,9 +241,9 @@ static void __cpuinit filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
* signs here... * signs here...
*/ */
if (cpu_has(c, df->feature) && if (cpu_has(c, df->feature) &&
((s32)df->feature < 0 ? ((s32)df->level < 0 ?
(u32)df->feature > (u32)c->extended_cpuid_level : (u32)df->level > (u32)c->extended_cpuid_level :
(s32)df->feature > (s32)c->cpuid_level)) { (s32)df->level > (s32)c->cpuid_level)) {
clear_cpu_cap(c, df->feature); clear_cpu_cap(c, df->feature);
if (warn) if (warn)
printk(KERN_WARNING printk(KERN_WARNING
@ -253,7 +253,7 @@ static void __cpuinit filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
df->level); df->level);
} }
} }
} }
/* /*
* Naming convention should be: <Name> [(<Codename>)] * Naming convention should be: <Name> [(<Codename>)]