The patch titled
mm-hugetlb-add-hugepage-support-to-pagemap-update
has been added to the -mm tree. Its filename is
mm-hugetlb-add-hugepage-support-to-pagemap-update.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mm-hugetlb-add-hugepage-support-to-pagemap-update
From: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
- NULL check of vma
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>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/task_mmu.c | 6 ++++--
mm/pagewalk.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff -puN fs/proc/task_mmu.c~mm-hugetlb-add-hugepage-support-to-pagemap-update fs/proc/task_mmu.c
--- a/fs/proc/task_mmu.c~mm-hugetlb-add-hugepage-support-to-pagemap-update
+++ a/fs/proc/task_mmu.c
@@ -668,13 +668,15 @@ static int pagemap_hugetlb_range(pte_t *
int err = 0;
vma = find_vma(walk->mm, addr);
- hs = hstate_vma(vma);
+ if (vma)
+ hs = hstate_vma(vma);
for (; addr != end; addr += PAGE_SIZE) {
u64 pfn = PM_NOT_PRESENT;
if (vma && (addr >= vma->vm_end)) {
vma = find_vma(walk->mm, addr);
- hs = hstate_vma(vma);
+ if (vma)
+ hs = hstate_vma(vma);
}
if (vma && (vma->vm_start <= addr) && is_vm_hugetlb_page(vma)) {
diff -puN mm/pagewalk.c~mm-hugetlb-add-hugepage-support-to-pagemap-update mm/pagewalk.c
--- a/mm/pagewalk.c~mm-hugetlb-add-hugepage-support-to-pagemap-update
+++ a/mm/pagewalk.c
@@ -123,7 +123,7 @@ int walk_page_range(unsigned long addr,
next = pgd_addr_end(addr, end);
/*
- * Handle hugetlb vma individually because pagetable walk for
+ * handle hugetlb vma individually because pagetable walk for
* the hugetlb page is dependent on the architecture and
* we can't handled it in the same manner as non-huge pages.
*/
_
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-mincore-cleanup.patch
mm-hugetlb-fix-hugepage-memory-leak-in-mincore-build-fix.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
