diff options
author | Mel Gorman <mgorman@techsingularity.net> | 2016-01-14 18:20:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 19:00:49 -0500 |
commit | 6ac0206bc0d13381e3ede3594bc0a3f8cd1d8ec9 (patch) | |
tree | f0266cdbae367f3d48bad6c53b7ed40b94048607 /mm/page_alloc.c | |
parent | cc292b0b43027cce9310a18ec3239b5e9b4ea301 (diff) |
mm/page_alloc.c: remove unnecessary parameter from __rmqueue
Commit 0aaa29a56e4f ("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: Mel Gorman <mgorman@techsingularity.net>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1e9a56065400..fbff97d7b298 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1781,7 +1781,7 @@ __rmqueue_fallback(struct zone *zone, unsigned int order, int start_migratetype) | |||
1781 | * Call me with the zone->lock already held. | 1781 | * Call me with the zone->lock already held. |
1782 | */ | 1782 | */ |
1783 | static struct page *__rmqueue(struct zone *zone, unsigned int order, | 1783 | static struct page *__rmqueue(struct zone *zone, unsigned int order, |
1784 | int migratetype, gfp_t gfp_flags) | 1784 | int migratetype) |
1785 | { | 1785 | { |
1786 | struct page *page; | 1786 | struct page *page; |
1787 | 1787 | ||
@@ -1811,7 +1811,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, | |||
1811 | 1811 | ||
1812 | spin_lock(&zone->lock); | 1812 | spin_lock(&zone->lock); |
1813 | for (i = 0; i < count; ++i) { | 1813 | for (i = 0; i < count; ++i) { |
1814 | struct page *page = __rmqueue(zone, order, migratetype, 0); | 1814 | struct page *page = __rmqueue(zone, order, migratetype); |
1815 | if (unlikely(page == NULL)) | 1815 | if (unlikely(page == NULL)) |
1816 | break; | 1816 | break; |
1817 | 1817 | ||
@@ -2234,7 +2234,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, | |||
2234 | trace_mm_page_alloc_zone_locked(page, order, migratetype); | 2234 | trace_mm_page_alloc_zone_locked(page, order, migratetype); |
2235 | } | 2235 | } |
2236 | if (!page) | 2236 | if (!page) |
2237 | page = __rmqueue(zone, order, migratetype, gfp_flags); | 2237 | page = __rmqueue(zone, order, migratetype); |
2238 | spin_unlock(&zone->lock); | 2238 | spin_unlock(&zone->lock); |
2239 | if (!page) | 2239 | if (!page) |
2240 | goto failed; | 2240 | goto failed; |