Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, smpboot: Fix cores per node printing on boot
  x86/amd-iommu: Fall back to GART if initialization fails
  x86/amd-iommu: Fix crash when request_mem_region fails
  x86/mm: Remove unused DBG() macro
  arch/x86/kernel: Add missing spin_unlock

diff --combined arch/x86/kernel/setup_percpu.c
index cf59276,401ff10..de3b63a
--- 1/arch/x86/kernel/setup_percpu.c
--- 2/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@@ -21,12 -21,6 +21,6 @@@
  #include <asm/cpu.h>
  #include <asm/stackprotector.h>
  
- #ifdef CONFIG_DEBUG_PER_CPU_MAPS
- # define DBG(fmt, ...) pr_dbg(fmt, ##__VA_ARGS__)
- #else
- # define DBG(fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)
- #endif
- 
  DEFINE_PER_CPU(int, cpu_number);
  EXPORT_PER_CPU_SYMBOL(cpu_number);
  
@@@ -247,7 -241,7 +241,7 @@@ void __init setup_per_cpu_areas(void
  #endif
  #endif
                /*
 -               * Up to this point, the boot CPU has been using .data.init
 +               * Up to this point, the boot CPU has been using .init.data
                 * area.  Reload any changed state for the boot CPU.
                 */
                if (cpu == boot_cpu_id)