diff options
author | David Rientjes <rientjes@google.com> | 2010-12-22 20:23:47 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-12-23 18:27:12 -0500 |
commit | 4e76f4e67a106ed827ca721b4c8b622047cd2f6d (patch) | |
tree | 12e650c56148e086183d1256bc1843134b0659bf /arch/x86/mm/amdtopology_64.c | |
parent | 34dc9e74968ef4b582c3815b0124d88a68dfabef (diff) |
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/amdtopology_64.c')
-rw-r--r-- | arch/x86/mm/amdtopology_64.c | 2 |
1 files changed, 2 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) | |||
69 | early_init_lapic_mapping(); | 69 | early_init_lapic_mapping(); |
70 | } | 70 | } |
71 | 71 | ||
72 | #ifdef CONFIG_NUMA_EMU | ||
72 | int __init amd_get_nodes(struct bootnode *physnodes) | 73 | int __init amd_get_nodes(struct bootnode *physnodes) |
73 | { | 74 | { |
74 | int i; | 75 | int i; |
@@ -81,6 +82,7 @@ int __init amd_get_nodes(struct bootnode *physnodes) | |||
81 | } | 82 | } |
82 | return ret; | 83 | return ret; |
83 | } | 84 | } |
85 | #endif /* CONFIG_NUMA_EMU */ | ||
84 | 86 | ||
85 | int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn) | 87 | int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn) |
86 | { | 88 | { |