x86-32, NUMA: use sparse_memory_present_with_active_regions()

Instead of calling memory_present() for each region from NUMA init,
call sparse_memory_present_with_active_regions() from paging_init()
similarly to x86-64.

For flat and numaq, this results in exactly the same memory_present()
calls.  For srat, if there are multiple memory chunks for a node,
after this change, memory_present() will be called separately for each
chunk instead of being called once to encompass the whole range, which
doesn't cause any harm and actually is the better behavior.

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>

diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index 0aced70815f0c563a498aee420c5b750f4b25658..41b8b29d36f541fa5baa0186dc9b1cbf8b8f6e38 100644 (file)
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -91,8 +91,6 @@ static inline void numaq_register_node(int node, struct sys_cfg_data *scd)
 
        memblock_x86_register_active_regions(node, node_start_pfn[node],
                                                node_end_pfn[node]);
-
-       memory_present(node, node_start_pfn[node], node_end_pfn[node]);
 }
 
 /*

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 80088f994193681f169c75f2757b7bfb723bc679..2cde0a34bed65d39878bef6fe572c0ba5ef2fb56 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -716,6 +716,7 @@ void __init paging_init(void)
         * NOTE: at this point the bootmem allocator is fully available.
         */
        olpc_dt_build_devicetree();
+       sparse_memory_present_with_active_regions(MAX_NUMNODES);
        sparse_init();
        zone_sizes_init();
 }

diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index e0d9716ab382df53dd045dfd821105a6de21219c..f847fa1e02dc49b2a03a68f1578cc66198740a72 100644 (file)
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -119,7 +119,6 @@ int __init get_memcfg_numa_flat(void)
        node_start_pfn[0] = 0;
        node_end_pfn[0] = max_pfn;
        memblock_x86_register_active_regions(0, 0, max_pfn);
-       memory_present(0, 0, max_pfn);
 
         /* Indicate there is one node available. */
        nodes_clear(node_online_map);

diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
index ae20046a9e985af69d20578092166ab119544076..6b9bfd78bc3559d2dbdd3ba8b721a8d6067940d2 100644 (file)
--- a/arch/x86/mm/srat_32.c
+++ b/arch/x86/mm/srat_32.c
@@ -209,7 +209,7 @@ static __init int node_read_chunk(int nid, struct node_memory_chunk_s *memory_ch
 
 int __init get_memcfg_from_srat(void)
 {
-       int i, j, nid;
+       int i, j;
 
        if (srat_disabled())
                goto out_fail;
@@ -273,12 +273,6 @@ int __init get_memcfg_from_srat(void)
        /* for out of order entries in SRAT */
        sort_node_map();
 
-       for_each_online_node(nid) {
-               unsigned long start = node_start_pfn[nid];
-               unsigned long end = min(node_end_pfn[nid], max_pfn);
-
-               memory_present(nid, start, end);
-       }
        return 1;
 out_fail:
        printk(KERN_DEBUG "failed to get NUMA memory information from SRAT"