From 089309f230fd9ac52728d359052ab9dcc3859a31 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 3 Jun 2008 10:09:45 +0200
Subject: [PATCH] --- yaml --- r: 99309 b: refs/heads/master c:
 2772f54bf37b033263abe4a2314c40a308a1a5cd h: refs/heads/master i:   99307:
 30af18d7d5db0f742489bd53241c2b758b133a28 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/mm/discontig_32.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

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