x86-32, NUMA: Move get_memcfg_numa() into numa_32.c

[~andy/linux] / arch / x86 / mm / numa_32.c

diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index f847fa1e02dc49b2a03a68f1578cc66198740a72..abf1247a4c32078d1ffb5948f08946db6ec2356d 100644 (file)
--- 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);
  *        a single node with all available processors in it with a flat
  *        memory map.
  */
-int __init get_memcfg_numa_flat(void)
+static int __init get_memcfg_numa_flat(void)
 {
        printk(KERN_DEBUG "NUMA - single node, flat memory mode\n");
 
@@ -332,6 +332,15 @@ static __init void init_alloc_remap(int nid)
               nid, node_pa, node_pa + size, remap_va, remap_va + size);
 }
 
+static void get_memcfg_numa(void)
+{
+       if (get_memcfg_numaq())
+               return;
+       if (get_memcfg_from_srat())
+               return;
+       get_memcfg_numa_flat();
+}
+
 void __init initmem_init(void)
 {
        int nid;