Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe091c20 authored by Tejun Heo's avatar Tejun Heo
Browse files

memblock: Kill memblock_init() 



memblock_init() initializes arrays for regions and memblock itself;
however, all these can be done with struct initializers and
memblock_init() can be removed.  This patch kills memblock_init() and
initializes memblock with struct initializer.

The only difference is that the first dummy entries don't have .nid
set to MAX_NUMNODES initially.  This doesn't cause any behavior
difference.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: "H. Peter Anvin" <hpa@zytor.com>
parent c5a1cb28

arch/arm/mm/init.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -333,7 +333,6 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) 




	sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);

	sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);





	memblock_init();

	for (i = 0; i < mi->nr_banks; i++)

	for (i = 0; i < mi->nr_banks; i++)

		memblock_add(mi->bank[i].start, mi->bank[i].size);

		memblock_add(mi->bank[i].start, mi->bank[i].size);

arch/microblaze/kernel/prom.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -122,7 +122,6 @@ void __init early_init_devtree(void *params) 
	of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);

	of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);





	/* Scan memory nodes and rebuild MEMBLOCKs */

	/* Scan memory nodes and rebuild MEMBLOCKs */

	memblock_init();

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory, NULL);

arch/openrisc/kernel/prom.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,6 @@ void __init early_init_devtree(void *params) 
	of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);

	of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);





	/* Scan memory nodes and rebuild MEMBLOCKs */

	/* Scan memory nodes and rebuild MEMBLOCKs */

	memblock_init();

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory, NULL);

arch/powerpc/kernel/prom.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -733,8 +733,6 @@ void __init early_init_devtree(void *params) 
	of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line);

	of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line);





	/* Scan memory nodes and rebuild MEMBLOCKs */

	/* Scan memory nodes and rebuild MEMBLOCKs */

	memblock_init();



	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);

arch/sh/mm/init.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -324,7 +324,6 @@ void __init paging_init(void) 
	unsigned long vaddr, end;

	unsigned long vaddr, end;

	int nid;

	int nid;





	memblock_init();

	sh_mv.mv_mem_init();

	sh_mv.mv_mem_init();





	early_reserve_mem();

	early_reserve_mem();