Merge tag 'linux-watchdog-4.20-rc1' of git://www.linux-watchdog.org/linux-watchdog

[sfrench/cifs-2.6.git] / arch / mips / loongson64 / loongson-3 / numa.c

diff --git a/arch/mips/loongson64/loongson-3/numa.c b/arch/mips/loongson64/loongson-3/numa.c
index 9717106de4a5a33c32f2261c0e21a2eb1f7fd87a..c1e6ec52c614eb0265fcb6189ad09caaa4185f2f 100644 (file)
--- a/arch/mips/loongson64/loongson-3/numa.c
+++ b/arch/mips/loongson64/loongson-3/numa.c
@@ -180,43 +180,39 @@ static void __init szmem(unsigned int node)
 
 static void __init node_mem_init(unsigned int node)
 {
-       unsigned long bootmap_size;
        unsigned long node_addrspace_offset;
-       unsigned long start_pfn, end_pfn, freepfn;
+       unsigned long start_pfn, end_pfn;
 
        node_addrspace_offset = nid_to_addroffset(node);
        pr_info("Node%d's addrspace_offset is 0x%lx\n",
                        node, node_addrspace_offset);
 
        get_pfn_range_for_nid(node, &start_pfn, &end_pfn);
-       freepfn = start_pfn;
-       if (node == 0)
-               freepfn = PFN_UP(__pa_symbol(&_end)); /* kernel end address */
-       pr_info("Node%d: start_pfn=0x%lx, end_pfn=0x%lx, freepfn=0x%lx\n",
-               node, start_pfn, end_pfn, freepfn);
+       pr_info("Node%d: start_pfn=0x%lx, end_pfn=0x%lx\n",
+               node, start_pfn, end_pfn);
 
        __node_data[node] = prealloc__node_data + node;
 
-       NODE_DATA(node)->bdata = &bootmem_node_data[node];
        NODE_DATA(node)->node_start_pfn = start_pfn;
        NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn;
 
-       bootmap_size = init_bootmem_node(NODE_DATA(node), freepfn,
-                                       start_pfn, end_pfn);
        free_bootmem_with_active_regions(node, end_pfn);
-       if (node == 0) /* used by finalize_initrd() */
+
+       if (node == 0) {
+               /* kernel end address */
+               unsigned long kernel_end_pfn = PFN_UP(__pa_symbol(&_end));
+
+               /* used by finalize_initrd() */
                max_low_pfn = end_pfn;
 
-       /* This is reserved for the kernel and bdata->node_bootmem_map */
-       reserve_bootmem_node(NODE_DATA(node), start_pfn << PAGE_SHIFT,
-               ((freepfn - start_pfn) << PAGE_SHIFT) + bootmap_size,
-               BOOTMEM_DEFAULT);
+               /* Reserve the kernel text/data/bss */
+               memblock_reserve(start_pfn << PAGE_SHIFT,
+                                ((kernel_end_pfn - start_pfn) << PAGE_SHIFT));
 
-       if (node == 0 && node_end_pfn(0) >= (0xffffffff >> PAGE_SHIFT)) {
                /* Reserve 0xfe000000~0xffffffff for RS780E integrated GPU */
-               reserve_bootmem_node(NODE_DATA(node),
-                               (node_addrspace_offset | 0xfe000000),
-                               32 << 20, BOOTMEM_DEFAULT);
+               if (node_end_pfn(0) >= (0xffffffff >> PAGE_SHIFT))
+                       memblock_reserve((node_addrspace_offset | 0xfe000000),
+                                        32 << 20);
        }
 
        sparse_memory_present_with_active_regions(node);