diff --git a/[refs] b/[refs]
index 77e7621895e0..2ac012e0c31c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84d6bd0e272e6eace1e7e4c501f32bddfb665bb2
+refs/heads/master: 2772f54bf37b033263abe4a2314c40a308a1a5cd
diff --git a/trunk/arch/x86/mm/discontig_32.c b/trunk/arch/x86/mm/discontig_32.c
index 435c343c14bc..d28987a2f2bb 100644
--- a/trunk/arch/x86/mm/discontig_32.c
+++ b/trunk/arch/x86/mm/discontig_32.c
@@ -454,3 +454,12 @@ int memory_add_physaddr_to_nid(u64 addr)
 
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
+
+#ifdef CONFIG_ACPI_NUMA
+/*
+ * Dummy on 32-bit, for now:
+ */
+void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
+{
+}
+#endif