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

Commit 6ac0206b authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm/page_alloc.c: remove unnecessary parameter from __rmqueue 



Commit 0aaa29a5 ("mm, page_alloc: reserve pageblocks for high-order
atomic allocations on demand") added an unnecessary and unused parameter
to __rmqueue.  It was a parameter that was used in an earlier version of
the patch and then left behind.  This patch cleans it up.

Signed-off-by: default avatarMel Gorman <mgorman@techsingularity.net>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cc292b0b

mm/page_alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ __rmqueue_fallback(struct zone *zone, unsigned int order, int start_migratetype) 
 * Call me with the zone->lock already held.

 */

static struct page *__rmqueue(struct zone *zone, unsigned int order,

				int migratetype, gfp_t gfp_flags)

				int migratetype)

{

	struct page *page;
@@ -1811,7 +1811,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, 


	spin_lock(&zone->lock);

	for (i = 0; i < count; ++i) {

		struct page *page = __rmqueue(zone, order, migratetype, 0);

		struct page *page = __rmqueue(zone, order, migratetype);

		if (unlikely(page == NULL))

			break;
@@ -2234,7 +2234,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, 
				trace_mm_page_alloc_zone_locked(page, order, migratetype);

		}

		if (!page)

			page = __rmqueue(zone, order, migratetype, gfp_flags);

			page = __rmqueue(zone, order, migratetype);

		spin_unlock(&zone->lock);

		if (!page)

			goto failed;