summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
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/mm
parent34dc9e74968ef4b582c3815b0124d88a68dfabef (diff)
downloadlinux-4e76f4e67a106ed827ca721b4c8b622047cd2f6d.tar.bz2
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/mm')
-rw-r--r--arch/x86/mm/amdtopology_64.c2
-rw-r--r--arch/x86/mm/srat_64.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c
index 51fae9cfdecb..fe050af614e2 100644
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
@@ -69,6 +69,7 @@ static __init void early_get_boot_cpu_id(void)
early_init_lapic_mapping();
}
+#ifdef CONFIG_NUMA_EMU
int __init amd_get_nodes(struct bootnode *physnodes)
{
int i;
@@ -81,6 +82,7 @@ int __init amd_get_nodes(struct bootnode *physnodes)
}
return ret;
}
+#endif /* CONFIG_NUMA_EMU */
int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn)
{
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index a35cb9d8b060..8241bf0f6eb2 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -339,6 +339,7 @@ static int __init nodes_cover_memory(const struct bootnode *nodes)
void __init acpi_numa_arch_fixup(void) {}
+#ifdef CONFIG_NUMA_EMU
int __init acpi_get_nodes(struct bootnode *physnodes)
{
int i;
@@ -351,6 +352,7 @@ int __init acpi_get_nodes(struct bootnode *physnodes)
}
return ret;
}
+#endif /* CONFIG_NUMA_EMU */
/* Use the information discovered above to actually set up the nodes. */
int __init acpi_scan_nodes(unsigned long start, unsigned long end)