aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-03 05:36:56 -0400
committerIngo Molnar <mingo@elte.hu>2008-06-03 05:45:09 -0400
commitcf3d0cb8a10a4fd19439bb34995d9ad28854739a (patch)
tree573e048b267b7b99f6d45a8935ace25b28a6801d
parentf3294690979634ee10398bb0beadfe1d4edb881d (diff)
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.
-rw-r--r--arch/x86/mm/discontig_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index bb8544a7cb9d..0d28b4bff817 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)
455EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); 455EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
456#endif 456#endif
457 457
458#ifdef CONFIG_ACPI_NUMA 458#if defined(CONFIG_ACPI_NUMA) && !defined(CONFIG_HAVE_ARCH_PARSE_SRAT)
459/* 459/*
460 * Dummy on 32-bit, for now: 460 * Dummy on 32-bit, for now:
461 */ 461 */