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

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

bootmem: replace node_boot_start in struct bootmem_data 



Almost all users of this field need a PFN instead of a physical address,
so replace node_boot_start with node_min_pfn.

[Lee.Schermerhorn@hp.com: fix spurious BUG_ON() in mark_bootmem()]
Signed-off-by: default avatarJohannes Weiner <hannes@saeureba.de>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarLee Schermerhorn <lee.schermerhorn@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 75a56cfe

arch/alpha/mm/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ void __init paging_init(void) 


	for_each_online_node(nid) {

		bootmem_data_t *bdata = &bootmem_node_data[nid];

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

		unsigned long start_pfn = bdata->node_min_pfn;

		unsigned long end_pfn = bdata->node_low_pfn;



		if (dma_local_pfn >= end_pfn - start_pfn)

arch/arm/plat-omap/fb.c

+1 −3
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ void __init omapfb_reserve_sdram(void) 
		return;



	bdata = NODE_DATA(0)->bdata;

	sdram_start = bdata->node_boot_start;

	sdram_start = bdata->node_min_pfn << PAGE_SHIFT;

	sdram_size = (bdata->node_low_pfn << PAGE_SHIFT) - sdram_start;

	reserved = 0;

	for (i = 0; ; i++) {
@@ -340,5 +340,3 @@ unsigned long omapfb_reserve_sram(unsigned long sram_pstart, 




#endif

arch/avr32/mm/init.c

+1 −2
Original line number Diff line number Diff line
@@ -119,8 +119,7 @@ void __init paging_init(void) 
		unsigned long zones_size[MAX_NR_ZONES];

		unsigned long low, start_pfn;



		start_pfn = pgdat->bdata->node_boot_start;

		start_pfn >>= PAGE_SHIFT;

		start_pfn = pgdat->bdata->node_min_pfn;

		low = pgdat->bdata->node_low_pfn;



		memset(zones_size, 0, sizeof(zones_size));

arch/ia64/mm/discontig.c

+10 −9
Original line number Diff line number Diff line
@@ -74,17 +74,17 @@ pg_data_t *pgdat_list[MAX_NUMNODES]; 
static int __init build_node_maps(unsigned long start, unsigned long len,

				  int node)

{

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

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

	struct bootmem_data *bdp = &bootmem_node_data[node];



	epfn = GRANULEROUNDUP(end) >> PAGE_SHIFT;

	cstart = GRANULEROUNDDOWN(start);

	spfn = GRANULEROUNDDOWN(start) >> PAGE_SHIFT;



	if (!bdp->node_low_pfn) {

		bdp->node_boot_start = cstart;

		bdp->node_min_pfn = spfn;

		bdp->node_low_pfn = epfn;

	} else {

		bdp->node_boot_start = min(cstart, bdp->node_boot_start);

		bdp->node_min_pfn = min(spfn, bdp->node_min_pfn);

		bdp->node_low_pfn = max(epfn, bdp->node_low_pfn);

	}
@@ -221,20 +221,21 @@ static void __init fill_pernode(int node, unsigned long pernode, 
static int __init find_pernode_space(unsigned long start, unsigned long len,

				     int node)

{

	unsigned long epfn;

	unsigned long spfn, epfn;

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

	struct bootmem_data *bdp = &bootmem_node_data[node];



	spfn = start >> PAGE_SHIFT;

	epfn = (start + len) >> PAGE_SHIFT;



	pages = bdp->node_low_pfn - (bdp->node_boot_start >> PAGE_SHIFT);

	pages = bdp->node_low_pfn - bdp->node_min_pfn;

	mapsize = bootmem_bootmap_pages(pages) << PAGE_SHIFT;



	/*

	 * Make sure this memory falls within this node's usable memory

	 * since we may have thrown some away in build_maps().

	 */

	if (start < bdp->node_boot_start || epfn > bdp->node_low_pfn)

	if (spfn < bdp->node_min_pfn || epfn > bdp->node_low_pfn)

		return 0;



	/* Don't setup this node's local space twice... */
@@ -296,7 +297,7 @@ static void __init reserve_pernode_space(void) 
		bdp = pdp->bdata;



		/* First the bootmem_map itself */

		pages = bdp->node_low_pfn - (bdp->node_boot_start>>PAGE_SHIFT);

		pages = bdp->node_low_pfn - bdp->node_min_pfn;

		size = bootmem_bootmap_pages(pages) << PAGE_SHIFT;

		base = __pa(bdp->node_bootmem_map);

		reserve_bootmem_node(pdp, base, size, BOOTMEM_DEFAULT);
@@ -466,7 +467,7 @@ void __init find_memory(void) 


		init_bootmem_node(pgdat_list[node],

				  map>>PAGE_SHIFT,

				  bdp->node_boot_start>>PAGE_SHIFT,

				  bdp->node_min_pfn,

				  bdp->node_low_pfn);

	}

arch/m32r/mm/discontig.c

+1 −2
Original line number Diff line number Diff line
@@ -123,8 +123,7 @@ unsigned long __init setup_memory(void) 
	return max_low_pfn;

}



#define START_PFN(nid)	\

	(NODE_DATA(nid)->bdata->node_boot_start >> PAGE_SHIFT)

#define START_PFN(nid)		(NODE_DATA(nid)->bdata->node_min_pfn)

#define MAX_LOW_PFN(nid)	(NODE_DATA(nid)->bdata->node_low_pfn)



unsigned long __init zone_sizes_init(void)