Currently, when free_all_bootmem() calls __free_pages_memory(), the number of contiguous pages that __free_pages_memory() passes to the buddy allocator is limited to BITS_PER_LONG. In order to be able to free only the first page of a 2MiB chunk, we need that to be increased to PTRS_PER_PMD. Signed-off-by: Robin Holt <holt@xxxxxxx> Signed-off-by: Nate Zimmer <nzimmer@xxxxxxx> To: "H. Peter Anvin" <hpa@xxxxxxxxx> To: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Linux Kernel <linux-kernel@xxxxxxxxxxxxxxx> Cc: Linux MM <linux-mm@xxxxxxxxx> Cc: Rob Landley <rob@xxxxxxxxxxx> Cc: Mike Travis <travis@xxxxxxx> Cc: Daniel J Blueman <daniel@xxxxxxxxxxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Yinghai Lu <yinghai@xxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> --- mm/nobootmem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/nobootmem.c b/mm/nobootmem.c index bdd3fa2..3b512ca 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -83,10 +83,10 @@ void __init free_bootmem_late(unsigned long addr, unsigned long size) static void __init __free_pages_memory(unsigned long start, unsigned long end) { unsigned long i, start_aligned, end_aligned; - int order = ilog2(BITS_PER_LONG); + int order = ilog2(max(BITS_PER_LONG, PTRS_PER_PMD)); - start_aligned = (start + (BITS_PER_LONG - 1)) & ~(BITS_PER_LONG - 1); - end_aligned = end & ~(BITS_PER_LONG - 1); + start_aligned = (start + ((1UL << order) - 1)) & ~((1UL << order) - 1); + end_aligned = end & ~((1UL << order) - 1); if (end_aligned <= start_aligned) { for (i = start; i < end; i++) @@ -98,7 +98,7 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end) for (i = start; i < start_aligned; i++) __free_pages_bootmem(pfn_to_page(i), 0); - for (i = start_aligned; i < end_aligned; i += BITS_PER_LONG) + for (i = start_aligned; i < end_aligned; i += 1 << order) __free_pages_bootmem(pfn_to_page(i), order); for (i = end_aligned; i < end; i++) -- 1.8.2.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>