summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/acpi.h
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2010-12-22 17:23:47 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2010-12-23 15:27:12 -0800
commit4e76f4e67a106ed827ca721b4c8b622047cd2f6d (patch)
tree12e650c56148e086183d1256bc1843134b0659bf /arch/x86/include/asm/acpi.h
parent34dc9e74968ef4b582c3815b0124d88a68dfabef (diff)
downloadop-kernel-dev-4e76f4e67a106ed827ca721b4c8b622047cd2f6d.zip
op-kernel-dev-4e76f4e67a106ed827ca721b4c8b622047cd2f6d.tar.gz
x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU
Both acpi_get_nodes() and amd_get_nodes() are only necessary when CONFIG_NUMA_EMU is enabled, so avoid compiling them when the option is disabled. Signed-off-by: David Rientjes <rientjes@google.com> LKML-Reference: <alpine.DEB.2.00.1012221701210.3701@chino.kir.corp.google.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/acpi.h')
-rw-r--r--arch/x86/include/asm/acpi.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 55d106b..b326fa9 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -188,14 +188,17 @@ extern int acpi_numa;
extern int acpi_get_nodes(struct bootnode *physnodes);
extern int acpi_scan_nodes(unsigned long start, unsigned long end);
#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
+
+#ifdef CONFIG_NUMA_EMU
extern void acpi_fake_nodes(const struct bootnode *fake_nodes,
int num_nodes);
+#endif
#else
static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
int num_nodes)
{
}
-#endif
+#endif /* CONFIG_ACPI_NUMA */
#define acpi_unlazy_tlb(x) leave_mm(x)
OpenPOWER on IntegriCloud