diff --git a/[refs] b/[refs]
index 58725172854e..8d03b1c4c6e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 129521dcc94f781890f8f668219ab79f0073ff9f
+refs/heads/master: 2413d2c12cf0dc5980d7b082d838d5468d83a8b9
diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c
index ac2dfa63646c..40d4e624414e 100644
--- a/trunk/drivers/acpi/processor_core.c
+++ b/trunk/drivers/acpi/processor_core.c
@@ -400,7 +400,7 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
 
 /* Use the acpiid in MADT to map cpus in case of SMP */
 #ifndef CONFIG_SMP
-#define convert_acpiid_to_cpu(acpi_id) (0xff)
+#define convert_acpiid_to_cpu(acpi_id, cpu_indexp) (0xff)
 #else
 
 #ifdef CONFIG_IA64