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

Commit b61bfa3c authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: move bootmem descriptors definition to a single place 



There are a lot of places that define either a single bootmem descriptor or an
array of them.  Use only one central array with MAX_NUMNODES items instead.

Signed-off-by: default avatarJohannes Weiner <hannes@saeurebad.de>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Kyle McMartin <kyle@parisc-linux.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8b05c7e6

arch/alpha/mm/numa.c

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <asm/pgalloc.h>



pg_data_t node_data[MAX_NUMNODES];

bootmem_data_t node_bdata[MAX_NUMNODES];

EXPORT_SYMBOL(node_data);



#undef DEBUG_DISCONTIG
@@ -141,7 +140,7 @@ setup_memory_node(int nid, void *kernel_end) 
		printk(" not enough mem to reserve NODE_DATA");

		return;

	}

	NODE_DATA(nid)->bdata = &node_bdata[nid];

	NODE_DATA(nid)->bdata = &bootmem_node_data[nid];



	printk(" Detected node memory:   start %8lu, end %8lu\n",

	       node_min_pfn, node_max_pfn);
@@ -304,8 +303,9 @@ void __init paging_init(void) 
	dma_local_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;



	for_each_online_node(nid) {

		unsigned long start_pfn = node_bdata[nid].node_boot_start >> PAGE_SHIFT;

		unsigned long end_pfn = node_bdata[nid].node_low_pfn;

		bootmem_data_t *bdata = &bootmem_node_data[nid];

		unsigned long start_pfn = bdata->node_boot_start >> PAGE_SHIFT;

		unsigned long end_pfn = bdata->node_low_pfn;



		if (dma_local_pfn >= end_pfn - start_pfn)

			zones_size[ZONE_DMA] = end_pfn - start_pfn;

arch/arm/mm/discontig.c

+16 −18
Original line number Diff line number Diff line
@@ -21,26 +21,24 @@ 
 * Our node_data structure for discontiguous memory.

 */



static bootmem_data_t node_bootmem_data[MAX_NUMNODES];



pg_data_t discontig_node_data[MAX_NUMNODES] = {

  { .bdata = &node_bootmem_data[0] },

  { .bdata = &node_bootmem_data[1] },

  { .bdata = &node_bootmem_data[2] },

  { .bdata = &node_bootmem_data[3] },

  { .bdata = &bootmem_node_data[0] },

  { .bdata = &bootmem_node_data[1] },

  { .bdata = &bootmem_node_data[2] },

  { .bdata = &bootmem_node_data[3] },

#if MAX_NUMNODES == 16

  { .bdata = &node_bootmem_data[4] },

  { .bdata = &node_bootmem_data[5] },

  { .bdata = &node_bootmem_data[6] },

  { .bdata = &node_bootmem_data[7] },

  { .bdata = &node_bootmem_data[8] },

  { .bdata = &node_bootmem_data[9] },

  { .bdata = &node_bootmem_data[10] },

  { .bdata = &node_bootmem_data[11] },

  { .bdata = &node_bootmem_data[12] },

  { .bdata = &node_bootmem_data[13] },

  { .bdata = &node_bootmem_data[14] },

  { .bdata = &node_bootmem_data[15] },

  { .bdata = &bootmem_node_data[4] },

  { .bdata = &bootmem_node_data[5] },

  { .bdata = &bootmem_node_data[6] },

  { .bdata = &bootmem_node_data[7] },

  { .bdata = &bootmem_node_data[8] },

  { .bdata = &bootmem_node_data[9] },

  { .bdata = &bootmem_node_data[10] },

  { .bdata = &bootmem_node_data[11] },

  { .bdata = &bootmem_node_data[12] },

  { .bdata = &bootmem_node_data[13] },

  { .bdata = &bootmem_node_data[14] },

  { .bdata = &bootmem_node_data[15] },

#endif

};

arch/ia64/mm/discontig.c

+5 −6
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct early_node_data { 
	struct ia64_node_data *node_data;

	unsigned long pernode_addr;

	unsigned long pernode_size;

	struct bootmem_data bootmem_data;

	unsigned long num_physpages;

#ifdef CONFIG_ZONE_DMA

	unsigned long num_dma_physpages;
@@ -76,7 +75,7 @@ static int __init build_node_maps(unsigned long start, unsigned long len, 
				  int node)

{

	unsigned long cstart, epfn, end = start + len;

	struct bootmem_data *bdp = &mem_data[node].bootmem_data;

	struct bootmem_data *bdp = &bootmem_node_data[node];



	epfn = GRANULEROUNDUP(end) >> PAGE_SHIFT;

	cstart = GRANULEROUNDDOWN(start);
@@ -167,7 +166,7 @@ static void __init fill_pernode(int node, unsigned long pernode, 
{

	void *cpu_data;

	int cpus = early_nr_cpus_node(node);

	struct bootmem_data *bdp = &mem_data[node].bootmem_data;

	struct bootmem_data *bdp = &bootmem_node_data[node];



	mem_data[node].pernode_addr = pernode;

	mem_data[node].pernode_size = pernodesize;
@@ -224,7 +223,7 @@ static int __init find_pernode_space(unsigned long start, unsigned long len, 
{

	unsigned long epfn;

	unsigned long pernodesize = 0, pernode, pages, mapsize;

	struct bootmem_data *bdp = &mem_data[node].bootmem_data;

	struct bootmem_data *bdp = &bootmem_node_data[node];



	epfn = (start + len) >> PAGE_SHIFT;
@@ -440,7 +439,7 @@ void __init find_memory(void) 
	efi_memmap_walk(find_max_min_low_pfn, NULL);



	for_each_online_node(node)

		if (mem_data[node].bootmem_data.node_low_pfn) {

		if (bootmem_node_data[node].node_low_pfn) {

			node_clear(node, memory_less_mask);

			mem_data[node].min_pfn = ~0UL;

		}
@@ -460,7 +459,7 @@ void __init find_memory(void) 
		else if (node_isset(node, memory_less_mask))

			continue;



		bdp = &mem_data[node].bootmem_data;

		bdp = &bootmem_node_data[node];

		pernode = mem_data[node].pernode_addr;

		pernodesize = mem_data[node].pernode_size;

		map = pernode + pernodesize;

arch/m32r/mm/discontig.c

+1 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ extern char _end[]; 


struct pglist_data *node_data[MAX_NUMNODES];

EXPORT_SYMBOL(node_data);

static bootmem_data_t node_bdata[MAX_NUMNODES] __initdata;



pg_data_t m32r_node_data[MAX_NUMNODES];
@@ -81,7 +80,7 @@ unsigned long __init setup_memory(void) 
	for_each_online_node(nid) {

		mp = &mem_prof[nid];

		NODE_DATA(nid)=(pg_data_t *)&m32r_node_data[nid];

		NODE_DATA(nid)->bdata = &node_bdata[nid];

		NODE_DATA(nid)->bdata = &bootmem_node_data[nid];

		min_pfn = mp->start_pfn;

		max_pfn = mp->start_pfn + mp->pages;

		bootmap_size = init_bootmem_node(NODE_DATA(nid), mp->free_pfn,
@@ -163,4 +162,3 @@ unsigned long __init zone_sizes_init(void) 


	return holes;

}

arch/m68k/mm/init.c

+1 −3
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 


DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);



static bootmem_data_t __initdata bootmem_data[MAX_NUMNODES];



pg_data_t pg_data_map[MAX_NUMNODES];

EXPORT_SYMBOL(pg_data_map);
@@ -58,7 +56,7 @@ void __init m68k_setup_node(int node) 
		pg_data_table[i] = pg_data_map + node;

	}

#endif

	pg_data_map[node].bdata = bootmem_data + node;

	pg_data_map[node].bdata = bootmem_node_data + node;

	node_set_online(node);

}