Revert "MIPS: loongson64: set nid for reserved memblock region"

tsbogend · tsbogend · commit c91c6b2f08af · 2024-01-27T11:07:49.000+01:00
This reverts commit ce7b1b9. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
diff --git a/arch/mips/loongson64/init.c b/arch/mips/loongson64/init.c
@@ -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
diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c
@@ -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);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,6 @@ void __init szmem(unsigned int node)`
`103`	`103`	`if (loongson_sysconf.vgabios_addr)`
`104`	`104`	`memblock_reserve(virt_to_phys((void *)loongson_sysconf.vgabios_addr),`
`105`	`105`	`SZ_256K);`
`106`		`- /* set nid for reserved memory */`
`107`		`- memblock_set_node((u64)node << 44, (u64)(node+1) << 44, &memblock.reserved, node);`
`108`	`106`	`}`
`109`	`107`
`110`	`108`	`#ifndef CONFIG_NUMA`
Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,6 @@ static void __init node_mem_init(unsigned int node)`
`132`	`132`
`133`	`133`	`/* Reserve pfn range 0~node[0]->node_start_pfn */`
`134`	`134`	`memblock_reserve(0, PAGE_SIZE * start_pfn);`
`135`		`- /* set nid for reserved memory on node 0 */`
`136`		`- memblock_set_node(0, (u64)1 << 44, &memblock.reserved, 1);`
`137`	`135`	`}`
`138`	`136`	`}`
`139`	`137`