The patch titled
Subject: mm-page_alloc-shorten-the-page-allocator-fast-path-fix
has been removed from the -mm tree. Its filename was
mm-page_alloc-shorten-the-page-allocator-fast-path-fix.patch
This patch was dropped because it was folded into mm-page_alloc-shorten-the-page-allocator-fast-path.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-page_alloc-shorten-the-page-allocator-fast-path-fix
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/page_alloc.c~mm-page_alloc-shorten-the-page-allocator-fast-path-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-page_alloc-shorten-the-page-allocator-fast-path-fix
+++ a/mm/page_alloc.c
@@ -3398,7 +3398,7 @@ retry_cpuset:
ac.nodemask, &ac.preferred_zone);
if (!ac.preferred_zone) {
page = NULL;
- goto out;
+ goto no_zone;
}
ac.classzone_idx = zonelist_zone_idx(preferred_zoneref);
@@ -3417,7 +3417,7 @@ retry_cpuset:
page = __alloc_pages_slowpath(alloc_mask, order, &ac);
-out:
+no_zone:
/*
* When updating a task's mems_allowed, it is possible to race with
* parallel threads in such a way that an allocation can fail while
_
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-shorten-the-page-allocator-fast-path.patch
mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice-fix.patch
mm-page_alloc-un-inline-the-bad-part-of-free_pages_check-fix.patch
mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix.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
