The patch titled
Subject: mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix
has been removed from the -mm tree. Its filename was
mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix.patch
This patch was dropped because it was folded into mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix
mm/page_alloc.c: In function 'free_pcp_prepare':
mm/page_alloc.c:997: error: implicit declaration of function 'free_pages_prepare'
mm/page_alloc.c: At top level:
mm/page_alloc.c:1202: error: conflicting types for 'free_pages_prepare'
mm/page_alloc.c:997: note: previous implicit declaration of 'free_pages_prepare' was here
might be a merge snafu
Cc: Jesper Dangaard Brouer <brouer@xxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN mm/page_alloc.c~mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix
+++ a/mm/page_alloc.c
@@ -991,6 +991,8 @@ out:
return ret;
}
+static bool free_pages_prepare(struct page *page, unsigned int order);
+
#ifdef CONFIG_DEBUG_VM
static inline bool free_pcp_prepare(struct page *page)
{
_
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-defer-debugging-checks-of-freed-pages-until-a-pcp-drain.patch
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix.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
