x86: fix sparse warnings in intel_cacheinfo.c
PATCH 1/1 x86: fix sparse warnings in intel_cacheinfo.c
arch/x86/kernel/cpu/intel_cacheinfo.c:355:7: warning: symbol 'i' shadows an earlier one arch/x86/kernel/cpu/intel_cacheinfo.c:296:39: originally declared here arch/x86/kernel/cpu/intel_cacheinfo.c:367:18: warning: incorrect type in argument 2 (different signedness)arch/x86/kernel/cpu/intel_cacheinfo.c:367:18: expected unsigned int *eaxarch/x86/kernel/cpu/intel_cacheinfo.c:367:18: got int *arch/x86/kernel/cpu/intel_cacheinfo.c:367:28: warning: incorrect type in argument 3 (different signedness)arch/x86/kernel/cpu/intel_cacheinfo.c:367:28: expected unsigned int *ebxarch/x86/kernel/cpu/intel_cacheinfo.c:367:28: got int *arch/x86/kernel/cpu/intel_cacheinfo.c:367:38: warning: incorrect type in argument 4 (different signedness)arch/x86/kernel/cpu/intel_cacheinfo.c:367:38: expected unsigned int *ecxarch/x86/kernel/cpu/intel_cacheinfo.c:367:38: got int *arch/x86/kernel/cpu/intel_cacheinfo.c:367:48: warning: incorrect type in argument 5 (different signedness)arch/x86/kernel/cpu/intel_cacheinfo.c:367:48: expected unsigned int *edxarch/x86/kernel/cpu/intel_cacheinfo.c:367:48: got int *
--- arch/x86/kernel/cpu/intel_cacheinfo.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +3 -3
@@ -352,8 +352,8 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)*/ if ((num_cache_leaves ==0 || c->x86 ==15 ) && c->cpuid_level >1 ) {/* supports eax=2 call */ -int i, j, n; -int regs[4 ]; +int j, n; +unsigned int regs[4 ];unsigned char *dp = (unsigned char *)regs;int only_trace =0 ;
@@ -368,7 +368,7 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)/* If bit 31 is set, this is an unknown format */ for ( j =0 ; j <3 ; j++ ) { -if ( regs[j] <0 ) regs[j] =0 ; +if (regs[j] & (1 <<31 )) regs[j] =0 ; }/* Byte 0 is level count, not a descriptor */
Signature · 1 line
1.5.4.rc4.1142.gf5a97
Ingo Molnar
AppliedQuoted 3 lines · Harvey Harrison
arch/x86/kernel/cpu/intel_cacheinfo.c:355:7: warning: symbol 'i' shadows an earlier onearch/x86/kernel/cpu/intel_cacheinfo.c:296:39: originally declared herearch/x86/kernel/cpu/intel_cacheinfo.c:367:18: warning: incorrect type in argument 2 (different signedness)
thanks, applied.
Ingo