]> err.no Git - linux-2.6/commitdiff
x86: apic_64.c fix sparse warnings about shadowed variables
authorThomas Gleixner <tglx@linutronix.de>
Mon, 12 May 2008 13:43:35 +0000 (15:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:13:10 +0000 (09:13 +0200)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/apic_64.c

index 0633cfd0dc291a1310f0632e1012cf663b5e89a9..07fda23a9f76aaab918a2c38db509e3b3d4c7dbb 100644 (file)
@@ -875,7 +875,7 @@ static int __init detect_init_APIC(void)
 
 void __init early_init_lapic_mapping(void)
 {
-       unsigned long apic_phys;
+       unsigned long phys_addr;
 
        /*
         * If no local APIC can be found then go out
@@ -884,11 +884,11 @@ void __init early_init_lapic_mapping(void)
        if (!smp_found_config)
                return;
 
-       apic_phys = mp_lapic_addr;
+       phys_addr = mp_lapic_addr;
 
-       set_fixmap_nocache(FIX_APIC_BASE, apic_phys);
+       set_fixmap_nocache(FIX_APIC_BASE, phys_addr);
        apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
-                                APIC_BASE, apic_phys);
+                   APIC_BASE, phys_addr);
 
        /*
         * Fetch the APIC ID of the BSP in case we have a