From a832b838607444ff9fa38984a091afbc6b48824f Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@suse.com>
Date: Tue, 8 May 2012 15:19:29 +0100
Subject: [PATCH] --- yaml --- r: 300295 b: refs/heads/master c:
 b2a3477727c1d43b92a3e4223f10ad5bf639df06 h: refs/heads/master i:   300293:
 5b337780a44199262335f7d72815418d0d0a0fa1   300291:
 d43241f6670347d224bc3125bf65a2a258e20eae   300287:
 c3107a3af6ff74005300545793fa9a6b722913e4 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/acpi/boot.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5324d85d1bbd..a155af042ecd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7164b3f5e5461b58baa82e82544ca5af71af287b
+refs/heads/master: b2a3477727c1d43b92a3e4223f10ad5bf639df06
diff --git a/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c
index a415b1f44365..7c439fe4941b 100644
--- a/trunk/arch/x86/kernel/acpi/boot.c
+++ b/trunk/arch/x86/kernel/acpi/boot.c
@@ -593,7 +593,7 @@ void __init acpi_set_irq_model_ioapic(void)
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
 #include <acpi/processor.h>
 
-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;