aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/numa_32.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-05-02 08:18:53 -0400
committerTejun Heo <tj@kernel.org>2011-05-02 08:18:53 -0400
commitdaf4f480ae24270bac06db4293908d36b4834e21 (patch)
tree017080a1325ae02b70006100de396640a94db2b8 /arch/x86/mm/numa_32.c
parenteca9ad313293c41021bfcf23e985a14f6991a121 (diff)
x86-32, NUMA: Move get_memcfg_numa() into numa_32.c
There's no reason get_memcfg_numa() to be implemented inline in mmzone_32.h. Move it to numa_32.c and also make get_memcfg_numa_flag() static. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'arch/x86/mm/numa_32.c')
-rw-r--r--arch/x86/mm/numa_32.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index f847fa1e02dc..abf1247a4c32 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -112,7 +112,7 @@ void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags);
112 * a single node with all available processors in it with a flat 112 * a single node with all available processors in it with a flat
113 * memory map. 113 * memory map.
114 */ 114 */
115int __init get_memcfg_numa_flat(void) 115static int __init get_memcfg_numa_flat(void)
116{ 116{
117 printk(KERN_DEBUG "NUMA - single node, flat memory mode\n"); 117 printk(KERN_DEBUG "NUMA - single node, flat memory mode\n");
118 118
@@ -332,6 +332,15 @@ static __init void init_alloc_remap(int nid)
332 nid, node_pa, node_pa + size, remap_va, remap_va + size); 332 nid, node_pa, node_pa + size, remap_va, remap_va + size);
333} 333}
334 334
335static void get_memcfg_numa(void)
336{
337 if (get_memcfg_numaq())
338 return;
339 if (get_memcfg_from_srat())
340 return;
341 get_memcfg_numa_flat();
342}
343
335void __init initmem_init(void) 344void __init initmem_init(void)
336{ 345{
337 int nid; 346 int nid;