Commit 53348f27 authored Jul 12, 2011 by Tejun Heo Committed by H. Peter Anvin Jul 13, 2011

bootmem: Fix __free_pages_bootmem() to use @order properly



a226f6c8 (FRV: Clean up bootmem allocator's page freeing algorithm)
separated out __free_pages_bootmem() from free_all_bootmem_core().
__free_pages_bootmem() takes @order argument but it assumes @order is
either 0 or ilog2(BITS_PER_LONG).  Note that all the current users
match that assumption and this doesn't cause actual problems.

Fix it by using 1 << order instead of BITS_PER_LONG.

Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1310457490-3356-3-git-send-email-tj@kernel.org


Cc: David Howells <dhowells@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parent bf61549a

mm/page_alloc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -705,10 +705,10 @@ void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
		int loop;

		prefetchw(page);
		for (loop = 0; loop < BITS_PER_LONG; loop++) {
		for (loop = 0; loop < (1 << order); loop++) {
		struct page *p = &page[loop];

		if (loop + 1 < BITS_PER_LONG)
		if (loop + 1 < (1 << order))
		prefetchw(p + 1);
		__ClearPageReserved(p);
		set_page_count(p, 0);