The patch titled
Subject: mm-move-buddy-list-manipulations-into-helpers-fix2
has been added to the -mm tree. Its filename is
mm-move-buddy-list-manipulations-into-helpers-fix2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-move-buddy-list-manipulations-into-helpers-fix2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-move-buddy-list-manipulations-into-helpers-fix2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Vlastimil Babka <vbabka@xxxxxxx>
Subject: mm-move-buddy-list-manipulations-into-helpers-fix2
del_page_from_free_area() migratetype parameter is unused, remove it.
Link: http://lkml.kernel.org/r/4672701b-6775-6efd-0797-b6242591419e@xxxxxxx
Signed-off-by: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mmzone.h | 2 +-
mm/page_alloc.c | 14 ++++----------
2 files changed, 5 insertions(+), 11 deletions(-)
--- a/include/linux/mmzone.h~mm-move-buddy-list-manipulations-into-helpers-fix2
+++ a/include/linux/mmzone.h
@@ -131,7 +131,7 @@ static inline struct page *get_page_from
}
static inline void del_page_from_free_area(struct page *page,
- struct free_area *area, int migratetype)
+ struct free_area *area)
{
list_del(&page->lru);
__ClearPageBuddy(page);
--- a/mm/page_alloc.c~mm-move-buddy-list-manipulations-into-helpers-fix2
+++ a/mm/page_alloc.c
@@ -903,8 +903,7 @@ continue_merging:
if (page_is_guard(buddy))
clear_page_guard(zone, buddy, order, migratetype);
else
- del_page_from_free_area(buddy, &zone->free_area[order],
- migratetype);
+ del_page_from_free_area(buddy, &zone->free_area[order]);
combined_pfn = buddy_pfn & pfn;
page = page + (combined_pfn - pfn);
pfn = combined_pfn;
@@ -2045,7 +2044,7 @@ struct page *__rmqueue_smallest(struct z
page = get_page_from_free_area(area, migratetype);
if (!page)
continue;
- del_page_from_free_area(page, area, migratetype);
+ del_page_from_free_area(page, area);
expand(zone, page, order, current_order, area, migratetype);
set_pcppage_migratetype(page, migratetype);
return page;
@@ -3016,7 +3015,7 @@ int __isolate_free_page(struct page *pag
/* Remove page from free list */
- del_page_from_free_area(page, area, mt);
+ del_page_from_free_area(page, area);
/*
* Set the pageblock if the isolated page is at least half of a
@@ -8369,9 +8368,6 @@ __offline_isolated_pages(unsigned long s
spin_lock_irqsave(&zone->lock, flags);
pfn = start_pfn;
while (pfn < end_pfn) {
- struct free_area *area;
- int mt;
-
if (!pfn_valid(pfn)) {
pfn++;
continue;
@@ -8390,13 +8386,11 @@ __offline_isolated_pages(unsigned long s
BUG_ON(page_count(page));
BUG_ON(!PageBuddy(page));
order = page_order(page);
- area = &zone->free_area[order];
#ifdef CONFIG_DEBUG_VM
pr_info("remove from free list %lx %d %lx\n",
pfn, 1 << order, end_pfn);
#endif
- mt = get_pageblock_migratetype(page);
- del_page_from_free_area(page, area, mt);
+ del_page_from_free_area(page, &zone->free_area[order]);
for (i = 0; i < (1 << order); i++)
SetPageReserved((page+i));
pfn += (1 << order);
_
Patches currently in -mm which might be from vbabka@xxxxxxx are
mm-mempolicy-fix-uninit-memory-access.patch
mm-move-buddy-list-manipulations-into-helpers-fix2.patch
