]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: fix sparse warning in mtrr/generic.c
authorThomas Gleixner <tglx@linutronix.de>
Wed, 30 Apr 2008 18:11:51 +0000 (20:11 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 25 May 2008 08:55:09 +0000 (10:55 +0200)
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>
arch/x86/kernel/cpu/mtrr/generic.c

index 5d241ce94a44f4f5b0fceb7a7a8292e08b6d9b08..0625d4158e5824f32905b10eda7992edf194e2b0 100644 (file)
@@ -213,12 +213,12 @@ void __init get_mtrr_state(void)
        mtrr_state.enabled = (lo & 0xc00) >> 10;
 
        if (amd_special_default_mtrr()) {
-               unsigned lo, hi;
+               unsigned low, high;
                /* TOP_MEM2 */
-               rdmsr(MSR_K8_TOP_MEM2, lo, hi);
-               tom2 = hi;
+               rdmsr(MSR_K8_TOP_MEM2, low, high);
+               tom2 = high;
                tom2 <<= 32;
-               tom2 |= lo;
+               tom2 |= low;
                tom2 &= 0xffffff8000000ULL;
        }
        if (mtrr_show) {