From: Jeff Mahoney <jeffm@suse.com>
Date: Mon, 21 May 2012 12:49:11 +0000 (-0400)
Subject: Update to 3.4-final.
X-Git-Url: http://git.alex.org.uk

Update to 3.4-final.

suse-commit: 91b2c6e7dedeaf80ebee53861f8eaadf972c40fe
---

358f2c54b1ef3c51399b4bb6c47382747e57fb92
diff --cc arch/x86/kernel/acpi/boot.c
index f1e560b,7c439fe..79c14db
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@@ -604,8 -593,7 +604,8 @@@ void __init acpi_set_irq_model_ioapic(v
  #ifdef CONFIG_ACPI_HOTPLUG_CPU
  #include <acpi/processor.h>
  
 +#ifndef CONFIG_XEN
- static void __cpuinitdata acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
+ static void __cpuinit acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
  {
  #ifdef CONFIG_ACPI_NUMA
  	int nid;