From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 3 Jun 2008 09:36:56 +0000 (+0200)
Subject: x86: 32-bit numa, build fix
X-Git-Tag: v2.6.27-rc1~1106^2~254
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cf3d0cb8a10a4fd19439bb34995d9ad28854739a;p=linux-2.6-omap-h63xx.git

x86: 32-bit numa, build fix

on Summit it's possible to have:

 CONFIG_ACPI_SRAT=y
 CONFIG_HAVE_ARCH_PARSE_SRAT=y

in which case acpi.h defines the acpi_numa_slit_init() and
acpi_numa_processor_affinity_init() methods as a macro.
---

diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index bb8544a7cb9..0d28b4bff81 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
@@ -455,7 +455,7 @@ int memory_add_physaddr_to_nid(u64 addr)
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
 
-#ifdef CONFIG_ACPI_NUMA
+#if defined(CONFIG_ACPI_NUMA) && !defined(CONFIG_HAVE_ARCH_PARSE_SRAT)
 /*
  * Dummy on 32-bit, for now:
  */