Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, asm: Use a lower case name for the end macro in atomic64_386_32.S
  x86, asm: Refactor atomic64_386_32.S to support old binutils and be cleaner
  x86: Document __phys_reloc_hide() usage in __pa_symbol()
  x86, apic: Map the local apic when parsing the MP table.

diff --combined arch/x86/kernel/apic/apic.c
index 980508c79082fadaacbc0339c0fe196d6a6dd5ce,c07e51391a3f119a998b40a051fa601642a84f95..e3b534cda49a8097dde55400083d7eeb8f9c694c
--- 1/arch/x86/kernel/apic/apic.c
--- 2/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -460,7 -460,7 +460,7 @@@ static void lapic_timer_broadcast(cons
  }
  
  /*
 - * Setup the local APIC timer for this CPU. Copy the initilized values
 + * Setup the local APIC timer for this CPU. Copy the initialized values
   * of the boot CPU and register the clock event in the framework.
   */
  static void __cpuinit setup_APIC_timer(void)
@@@ -1606,7 -1606,7 +1606,7 @@@ void __init init_apic_mappings(void
                 * acpi lapic path already maps that address in
                 * acpi_register_lapic_address()
                 */
-               if (!acpi_lapic)
+               if (!acpi_lapic && !smp_found_config)
                        set_fixmap_nocache(FIX_APIC_BASE, apic_phys);
  
                apic_printk(APIC_VERBOSE, "mapped APIC to %08lx (%08lx)\n",