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

x86: fix arch/x86/kernel/cpu/mtrr/main.c warning 

fix this warning reported by Andrew Morton:

> arch/x86/kernel/cpu/mtrr/main.c: In function 'mtrr_bp_init':
> arch/x86/kernel/cpu/mtrr/main.c:1170: warning: 'extra_remove_base' may be used uninitialized in this function

the warning is bogus but the logic that prevents uninitialized use
is a bit convoluted so simplify it all.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-09-18 23:55:27 -07:00 committed by Ingo Molnar
parent 5e51900be6
commit 279b0bbba2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/cpu/mtrr/main.c
View File

@ -1218,11 +1218,10 @@ static int __init mtrr_cleanup(unsigned address_bits)
memset(range, 0, sizeof(range)); memset(range, 0, sizeof(range));
extra_remove_size = 0; extra_remove_size = 0;
if (mtrr_tom2) { extra_remove_base = 1 << (32 - PAGE_SHIFT);
extra_remove_base = 1 << (32 - PAGE_SHIFT); if (mtrr_tom2)
extra_remove_size = extra_remove_size =
(mtrr_tom2 >> PAGE_SHIFT) - extra_remove_base; (mtrr_tom2 >> PAGE_SHIFT) - extra_remove_base;
}
nr_range = x86_get_mtrr_mem_range(range, 0, extra_remove_base, nr_range = x86_get_mtrr_mem_range(range, 0, extra_remove_base,
extra_remove_size); extra_remove_size);
range_sums = sum_ranges(range, nr_range); range_sums = sum_ranges(range, nr_range);