diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-01-31 16:05:43 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-31 16:05:43 -0500 |
commit | c1666e663d8443f57c1c6b0acac70c3fbaea9014 (patch) | |
tree | fa91d87634f22dd64ecd71d74e61234d48215ceb /arch/x86 | |
parent | 8af03e782cae1e0a0f530ddd22301cdd12cf9dc0 (diff) |
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 *eax
arch/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 *ebx
arch/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 *ecx
arch/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 *edx
arch/x86/kernel/cpu/intel_cacheinfo.c:367:48: got int *
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/cpu/intel_cacheinfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 8b4507b8469b..1b889860eb73 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
@@ -352,8 +352,8 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c) | |||
352 | */ | 352 | */ |
353 | if ((num_cache_leaves == 0 || c->x86 == 15) && c->cpuid_level > 1) { | 353 | if ((num_cache_leaves == 0 || c->x86 == 15) && c->cpuid_level > 1) { |
354 | /* supports eax=2 call */ | 354 | /* supports eax=2 call */ |
355 | int i, j, n; | 355 | int j, n; |
356 | int regs[4]; | 356 | unsigned int regs[4]; |
357 | unsigned char *dp = (unsigned char *)regs; | 357 | unsigned char *dp = (unsigned char *)regs; |
358 | int only_trace = 0; | 358 | int only_trace = 0; |
359 | 359 | ||
@@ -368,7 +368,7 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c) | |||
368 | 368 | ||
369 | /* If bit 31 is set, this is an unknown format */ | 369 | /* If bit 31 is set, this is an unknown format */ |
370 | for ( j = 0 ; j < 3 ; j++ ) { | 370 | for ( j = 0 ; j < 3 ; j++ ) { |
371 | if ( regs[j] < 0 ) regs[j] = 0; | 371 | if (regs[j] & (1 << 31)) regs[j] = 0; |
372 | } | 372 | } |
373 | 373 | ||
374 | /* Byte 0 is level count, not a descriptor */ | 374 | /* Byte 0 is level count, not a descriptor */ |