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

Commit c3993076 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: page_alloc: generalize order handling in __free_pages_bootmem()



__free_pages_bootmem() used to special-case higher-order frees to save
individual page checking with free_pages_bulk().

Nowadays, both zero order and non-zero order frees use free_pages(), which
checks each individual page anyway, and so there is little point in making
the distinction anymore.  The higher-order loop will work just fine for
zero order pages.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43d2b113
Loading
Loading
Loading
Loading
+12 −21
Original line number Diff line number Diff line
@@ -730,24 +730,16 @@ static void __free_pages_ok(struct page *page, unsigned int order)
	local_irq_restore(flags);
}

/*
 * permit the bootmem allocator to evade page validation on high-order frees
 */
void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
{
	if (order == 0) {
		__ClearPageReserved(page);
		set_page_count(page, 0);
		set_page_refcounted(page);
		__free_page(page);
	} else {
		int loop;
	unsigned int nr_pages = 1 << order;
	unsigned int loop;

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

			if (loop + 1 < (1 << order))
		if (loop + 1 < nr_pages)
			prefetchw(p + 1);
		__ClearPageReserved(p);
		set_page_count(p, 0);
@@ -756,7 +748,6 @@ void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
	set_page_refcounted(page);
	__free_pages(page, order);
}
}


/*