The quilt patch titled
Subject: smaps-fix-the-abnormal-memory-statistics-obtained-through-proc-pid-smaps-fix
has been removed from the -mm tree. Its filename was
smaps-fix-the-abnormal-memory-statistics-obtained-through-proc-pid-smaps-fix.patch
This patch was dropped because it was folded into smaps-fix-the-abnormal-memory-statistics-obtained-through-proc-pid-smaps.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: smaps-fix-the-abnormal-memory-statistics-obtained-through-proc-pid-smaps-fix
Date: Wed Jul 26 12:14:31 PM PDT 2023
tweak comment and code layout
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: liubo <liubo254@xxxxxxxxxx>
Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Cc: Peter Xu <peterx@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/task_mmu.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- a/fs/proc/task_mmu.c~smaps-fix-the-abnormal-memory-statistics-obtained-through-proc-pid-smaps-fix
+++ a/fs/proc/task_mmu.c
@@ -587,10 +587,12 @@ static void smaps_pmd_entry(pmd_t *pmd,
bool migration = false;
if (pmd_present(*pmd)) {
- /* FOLL_DUMP will return -EFAULT on huge zero page
- * FOLL_FORCE follow a PROT_NONE mapped page
+ /*
+ * FOLL_DUMP: return -EFAULT on huge zero page
+ * FOLL_FORCE: follow a PROT_NONE mapped page
*/
- page = follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP | FOLL_FORCE);
+ page = follow_trans_huge_pmd(vma, addr, pmd,
+ FOLL_DUMP | FOLL_FORCE);
} else if (unlikely(thp_migration_supported() && is_swap_pmd(*pmd))) {
swp_entry_t entry = pmd_to_swp_entry(*pmd);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
smaps-fix-the-abnormal-memory-statistics-obtained-through-proc-pid-smaps.patch
mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix.patch
swap-stop-add-to-avail-list-is-swap-is-full-checkpatch-fixes.patch
fs-buffer-clean-up-block_commit_write-fix.patch
mm-page_alloc-avoid-false-page-outside-zone-error-info-fix.patch
mm-make-pte_marker_swapin_error-more-general-fix.patch
mm-kfence-allocate-kfence_metadata-at-runtime-fix.patch
acpi-hmat-calculate-abstract-distance-with-hmat-checkpatch-fixes.patch
signal-print-comm-and-exe-name-on-fatal-signals-fix.patch
