The patch titled
Subject: mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2
has been removed from the -mm tree. Its filename was
mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2.patch
This patch was dropped because it was folded into mm-fix-huge-zero-page-accounting-in-smaps-report.patch
------------------------------------------------------
From: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx>
Subject: mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2
fs/proc/task_mmu.c:474 smaps_account() warn: should 'size << 12' be a 64 bit type?
Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/task_mmu.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN fs/proc/task_mmu.c~mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2 fs/proc/task_mmu.c
--- a/fs/proc/task_mmu.c~mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2
+++ a/fs/proc/task_mmu.c
@@ -465,17 +465,16 @@ static void smaps_account(struct mem_siz
mss->shared_dirty += size;
else
mss->shared_clean += size;
- mss->pss += (size << PSS_SHIFT) / mapcount;
+ mss->pss += ((u64)size << PSS_SHIFT) / mapcount;
} else {
if (dirty || PageDirty(page))
mss->private_dirty += size;
else
mss->private_clean += size;
- mss->pss += (size << PSS_SHIFT);
+ mss->pss += (u64)size << PSS_SHIFT;
}
}
-
static void smaps_pte_entry(pte_t *pte, unsigned long addr,
struct mm_walk *walk)
{
_
Patches currently in -mm which might be from kirill@xxxxxxxxxxxxx are
origin.patch
mm-verify-compound-order-when-freeing-a-page.patch
thp-do-not-mark-zero-page-pmd-write-protected-explicitly.patch
mm-fix-huge-zero-page-accounting-in-smaps-report.patch
mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2-fix.patch
mm-embed-the-memcg-pointer-directly-into-struct-page.patch
mm-embed-the-memcg-pointer-directly-into-struct-page-fix.patch
mm-page_cgroup-rename-file-to-mm-swap_cgroupc.patch
mm-move-page-mem_cgroup-bad-page-handling-into-generic-code.patch
mm-move-page-mem_cgroup-bad-page-handling-into-generic-code-fix.patch
mm-move-page-mem_cgroup-bad-page-handling-into-generic-code-fix-2.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
