The patch titled
mm-hugetlb-fix-hugepage-memory-leak-in-walk_page_range-update
has been removed from the -mm tree. Its filename was
mm-hugetlb-fix-hugepage-memory-leak-in-walk_page_range-update.patch
This patch was dropped because it was folded into mm-hugetlb-fix-hugepage-memory-leak-in-walk_page_range.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mm-hugetlb-fix-hugepage-memory-leak-in-walk_page_range-update
From: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
- NULL check of vma
- remove redundant ternary operation
Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: Hugh Dickins <hugh.dickins@xxxxxxxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/pagewalk.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN mm/pagewalk.c~mm-hugetlb-fix-hugepage-memory-leak-in-walk_page_range-update mm/pagewalk.c
--- a/mm/pagewalk.c~mm-hugetlb-fix-hugepage-memory-leak-in-walk_page_range-update
+++ a/mm/pagewalk.c
@@ -123,8 +123,9 @@ int walk_page_range(unsigned long addr,
/* skip hugetlb vma to avoid hugepage PMD being cleared
* in pmd_none_or_clear_bad(). */
vma = find_vma(walk->mm, addr);
- if (is_vm_hugetlb_page(vma)) {
- next = (vma->vm_end < next) ? vma->vm_end : next;
+ if (vma && is_vm_hugetlb_page(vma)) {
+ if (vma->vm_end < next)
+ next = vma->vm_end;
continue;
}
_
Patches currently in -mm which might be from n-horiguchi@xxxxxxxxxxxxx are
mm-hugetlb-fix-hugepage-memory-leak-in-mincore.patch
mm-hugetlb-fix-hugepage-memory-leak-in-walk_page_range.patch
mm-hugetlb-fix-hugepage-memory-leak-in-walk_page_range-update.patch
mm-hugetlb-add-hugepage-support-to-pagemap.patch
mm-hugetlb-add-hugepage-support-to-pagemap-update.patch
mm-hugetlb-add-hugepage-support-to-pagemap-build-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
