The patch titled
Subject: mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix
has been removed from the -mm tree. Its filename was
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix.patch
This patch was dropped because it was folded into mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff -puN mm/page_alloc.c~mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix
+++ a/mm/page_alloc.c
@@ -991,7 +991,8 @@ out:
return ret;
}
-static bool free_pages_prepare(struct page *page, unsigned int order);
+static bool free_pages_prepare(struct page *page, unsigned int order,
+ bool check_free);
#ifdef CONFIG_DEBUG_VM
static inline bool free_pcp_prepare(struct page *page)
@@ -1178,8 +1179,8 @@ void __meminit reserve_bootmem_region(un
}
}
-static __always_inline bool free_pages_prepare(struct page *page, unsigned int order,
- bool check_free)
+static __always_inline bool free_pages_prepare(struct page *page,
+ unsigned int order, bool check_free)
{
int bad = 0;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
include-linux-nodemaskh-create-next_node_in-helper.patch
mm-hugetlbc-use-first_memory_node.patch
mm-mempolicyc-offset_il_node-document-and-clarify.patch
mm-uninline-page_mapped.patch
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare.patch
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
