diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-04-30 14:11:51 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-25 04:55:09 -0400 |
commit | 0da72a4aeb4482c64c1142a2e36b556d13374937 (patch) | |
tree | f684a3ddff51ef1774e8e39c2b5dbf0a96f2c80e /arch/x86/kernel | |
parent | 75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4 (diff) |
x86: fix sparse warning in mtrr/generic.c
arch/x86/kernel/cpu/mtrr/generic.c:216:12: warning: symbol 'lo' shadows an earlier one
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/cpu/mtrr/generic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index 5d241ce94a44..0625d4158e58 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c | |||
@@ -213,12 +213,12 @@ void __init get_mtrr_state(void) | |||
213 | mtrr_state.enabled = (lo & 0xc00) >> 10; | 213 | mtrr_state.enabled = (lo & 0xc00) >> 10; |
214 | 214 | ||
215 | if (amd_special_default_mtrr()) { | 215 | if (amd_special_default_mtrr()) { |
216 | unsigned lo, hi; | 216 | unsigned low, high; |
217 | /* TOP_MEM2 */ | 217 | /* TOP_MEM2 */ |
218 | rdmsr(MSR_K8_TOP_MEM2, lo, hi); | 218 | rdmsr(MSR_K8_TOP_MEM2, low, high); |
219 | tom2 = hi; | 219 | tom2 = high; |
220 | tom2 <<= 32; | 220 | tom2 <<= 32; |
221 | tom2 |= lo; | 221 | tom2 |= low; |
222 | tom2 &= 0xffffff8000000ULL; | 222 | tom2 &= 0xffffff8000000ULL; |
223 | } | 223 | } |
224 | if (mtrr_show) { | 224 | if (mtrr_show) { |