Revert "MIPS: loongson64: set nid for reserved memblock region"
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>
Sat, 27 Jan 2024 10:07:49 +0000 (11:07 +0100)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Sat, 27 Jan 2024 10:07:49 +0000 (11:07 +0100)
This reverts commit ce7b1b97776ec0b068c4dd6b6dbb48ae09a23519.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/loongson64/init.c
arch/mips/loongson64/numa.c

index 000ba91c0886e3cb9d734f57743679847c6db297..f25caa6aa9d306e84d719e97ea54f7b8faa449c1 100644 (file)
@@ -103,8 +103,6 @@ void __init szmem(unsigned int node)
        if (loongson_sysconf.vgabios_addr)
                memblock_reserve(virt_to_phys((void *)loongson_sysconf.vgabios_addr),
                                SZ_256K);
-       /* set nid for reserved memory */
-       memblock_set_node((u64)node << 44, (u64)(node+1) << 44, &memblock.reserved, node);
 }
 
 #ifndef CONFIG_NUMA
index 6345e096c53261b52a7759005325204b0bad3002..8f61e93c0c5bcf07134cc22a06913c57e5140af4 100644 (file)
@@ -132,8 +132,6 @@ static void __init node_mem_init(unsigned int node)
 
                /* Reserve pfn range 0~node[0]->node_start_pfn */
                memblock_reserve(0, PAGE_SIZE * start_pfn);
-               /* set nid for reserved memory on node 0 */
-               memblock_set_node(0, (u64)1 << 44, &memblock.reserved, 1);
        }
 }