The patch titled
Subject: mm-page_alloc-skip-waternark_boost-for-atomic-order-0-allocations-fix
has been removed from the -mm tree. Its filename was
mm-page_alloc-skip-waternark_boost-for-atomic-order-0-allocations-fix.patch
This patch was dropped because it was folded into mm-page_alloc-skip-waternark_boost-for-atomic-order-0-allocations.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-page_alloc-skip-waternark_boost-for-atomic-order-0-allocations-fix
fix comment grammar, reflow comment
Cc: Charan Teja Reddy <charante@xxxxxxxxxxxxxx>
Cc: Vinayak Menon <vinmenon@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/mm/page_alloc.c~mm-page_alloc-skip-waternark_boost-for-atomic-order-0-allocations-fix
+++ a/mm/page_alloc.c
@@ -3748,11 +3748,11 @@ retry:
mark = wmark_pages(zone, alloc_flags & ALLOC_WMARK_MASK);
/*
* Allow GFP_ATOMIC order-0 allocations to exclude the
- * zone->watermark_boost in its watermark calculations.
- * We rely on the ALLOC_ flags set for GFP_ATOMIC
- * requests in gfp_to_alloc_flags() for this. Reason not to
- * use the GFP_ATOMIC directly is that we want to fall back
- * to slow path thus wake up kswapd.
+ * zone->watermark_boost in their watermark calculations.
+ * We rely on the ALLOC_ flags set for GFP_ATOMIC requests in
+ * gfp_to_alloc_flags() for this. Reason not to use the
+ * GFP_ATOMIC directly is that we want to fall back to slow path
+ * thus wake up kswapd.
*/
if (unlikely(!order && !(alloc_flags & ALLOC_WMARK_MASK) &&
(alloc_flags & (ALLOC_HARDER | ALLOC_HIGH)))) {
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-page_alloc-skip-waternark_boost-for-atomic-order-0-allocations.patch
arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch
arch-kmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
arch-kunmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
kmap-consolidate-kmap_prot-definitions-checkpatch-fixes.patch
mm-replace-zero-length-array-with-flexible-array-member-fix.patch
mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch
