diff options
| author | Yinghai Lu | 2008-09-19 08:55:27 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-09-19 09:16:06 +0200 |
| commit | 279b0bbba2bb647348ad90e183b3960aa99eccfd (patch) | |
| tree | 1c605b206a48a4b81feea3ce5fce150eee88b1e8 /arch/x86/kernel/cpu/mtrr | |
| parent | Merge commit 'v2.6.27-rc6' into x86/cleanups (diff) | |
| download | kernel-qcow2-linux-279b0bbba2bb647348ad90e183b3960aa99eccfd.tar.gz kernel-qcow2-linux-279b0bbba2bb647348ad90e183b3960aa99eccfd.tar.xz kernel-qcow2-linux-279b0bbba2bb647348ad90e183b3960aa99eccfd.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index b117d7f8a564..8a7c79234be6 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c @@ -1218,11 +1218,10 @@ static int __init mtrr_cleanup(unsigned address_bits) memset(range, 0, sizeof(range)); 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 = (mtrr_tom2 >> PAGE_SHIFT) - extra_remove_base; - } nr_range = x86_get_mtrr_mem_range(range, 0, extra_remove_base, extra_remove_size); range_sums = sum_ranges(range, nr_range); |