--- a/mm/bootmem.c 2004-08-05 15:33:39.000000000 -0500 +++ b/mm/bootmem.c 2004-08-05 16:25:05.000000000 -0500 @@ -259,6 +259,7 @@ static unsigned long __init free_all_boo unsigned long i, count, total = 0; unsigned long idx; unsigned long *map; + int gofast = 0; BUG_ON(!bdata->node_bootmem_map); @@ -267,14 +268,32 @@ static unsigned long __init free_all_boo page = virt_to_page(phys_to_virt(bdata->node_boot_start)); idx = bdata->node_low_pfn - (bdata->node_boot_start >> PAGE_SHIFT); map = bdata->node_bootmem_map; + if (bdata->node_boot_start == 0 || + ffs(bdata->node_boot_start) - PAGE_SHIFT > ffs(BITS_PER_LONG)) + gofast = 1; for (i = 0; i < idx; ) { unsigned long v = ~map[i / BITS_PER_LONG]; - if (v) { + if (gofast && v == ~0UL) { + int j; + + count += BITS_PER_LONG; + (page)->flags &= ~(1UL << PG_reserved); + set_page_count(page, 1); + for (j = 1; j < BITS_PER_LONG; j++) { + if (j + 16 < BITS_PER_LONG) { + prefetchw(page + j + 16); + } + (page + j)->flags &= ~(1UL << PG_reserved); + } + __free_pages(page, ffs(BITS_PER_LONG)-1); + i += BITS_PER_LONG; + page += BITS_PER_LONG; + } else if (v) { unsigned long m; for (m = 1; m && i < idx; m<<=1, page++, i++) { if (v & m) { count++; - ClearPageReserved(page); + (page)->flags &= ~(1UL << PG_reserved); set_page_count(page, 1); __free_page(page); }