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

Commit 6e3254c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "x86-64: Reverse order of bootmem lists" 



As requested by Thomas Gleixner <tglx@linutronix.de>:

  "5d3d0f77 breaks a couple of ARM
   boards, which depend on the historical bootmem allocation order.
   There is a cleaner solution around to remove the pgdat list
   completely, but this is a topic for post 2.6.14

   Andi signalled ACK already."

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 13402580

mm/bootmem.c

+3 −11
Original line number Original line Diff line number Diff line
@@ -61,17 +61,9 @@ static unsigned long __init init_bootmem_core (pg_data_t *pgdat, 
{

{

	bootmem_data_t *bdata = pgdat->bdata;

	bootmem_data_t *bdata = pgdat->bdata;

	unsigned long mapsize = ((end - start)+7)/8;

	unsigned long mapsize = ((end - start)+7)/8;

	static struct pglist_data *pgdat_last;





	pgdat->pgdat_next = pgdat_list;

	pgdat->pgdat_next = NULL;

	/* Add new nodes last so that bootmem always starts

	   searching in the first nodes, not the last ones */

	if (pgdat_last)

		pgdat_last->pgdat_next = pgdat;

	else {

	pgdat_list = pgdat;

	pgdat_list = pgdat;

		pgdat_last = pgdat;

	}





	mapsize = ALIGN(mapsize, sizeof(long));

	mapsize = ALIGN(mapsize, sizeof(long));

	bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT);

	bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT);