The patch titled Subject: mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma-fix has been removed from the -mm tree. Its filename was mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma-fix.patch This patch was dropped because it was folded into mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma-fix use vma_hugecache_offset() directly, per Michal Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Hillf Danton <dhillf@xxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Mel Gorman <mel@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/hugetlb.c~mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma-fix mm/hugetlb.c --- a/mm/hugetlb.c~mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma-fix +++ a/mm/hugetlb.c @@ -2315,7 +2315,7 @@ static int unmap_ref_private(struct mm_s * from page cache lookup which is in HPAGE_SIZE units. */ address = address & huge_page_mask(h); - pgoff = linear_hugepage_index(vma, address); + pgoff = vma_hugecache_offset(h, vma, address); mapping = (struct address_space *)page_private(page); /* _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes.patch mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault.patch mm-more-intensive-memory-corruption-debug.patch mm-exclude-reserved-pages-from-dirtyable-memory.patch mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma.patch mempool-fix-first-round-failure-behavior-fix.patch backlight-convert-pwm_bl-to-dev_pm_ops-fix.patch leds-add-driver-for-tca6507-led-controller.patch checkpatch-improve-memset-and-min-max-with-cast-checking-fix.patch checkpatch-catch-all-occurances-of-type-and-cast-spacing-errors-per-line-checkpatch-fixes.patch drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc-fix.patch drivers-rtc-rtc-mxcc-make-alarm-work-fix.patch rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-checkpatch-fixes.patch rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-v3-checkpatch-fixes.patch procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes.patch procfs-parse-mount-options-fix.patch procfs-add-hidepid=-and-gid=-mount-options-fix-2.patch workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-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