Merge ../torvalds-2.6/

1 files changed, 11 insertions, 3 deletions

diff --git a/mm/bootmem.c b/mm/bootmem.c
index c1330cc1978..8ec4e4c2a17 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -61,9 +61,17 @@ static unsigned long __init init_bootmem_core (pg_data_t *pgdat,
 {
 	bootmem_data_t *bdata = pgdat->bdata;
 	unsigned long mapsize = ((end - start)+7)/8;
-
-	pgdat->pgdat_next = pgdat_list;
-	pgdat_list = pgdat;
+	static struct pglist_data *pgdat_last;
+
+	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_last = pgdat;
+	}
 
 	mapsize = ALIGN(mapsize, sizeof(long));
 	bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT);