The patch titled
Subject: mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix
has been added to the -mm tree. Its filename is
mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix.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/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix
fix typo, per Huang, Ying
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Andrei Vagin <avagin@xxxxxxxxxx>
Cc: Daniel Colascione <dancol@xxxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: "Huang, Ying" <ying.huang@xxxxxxxxx>
Cc: "Jerome Glisse" <jglisse@xxxxxxxxxx>
Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Zi Yan <zi.yan@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN fs/proc/task_mmu.c~mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix fs/proc/task_mmu.c
--- a/fs/proc/task_mmu.c~mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix
+++ a/fs/proc/task_mmu.c
@@ -1353,7 +1353,7 @@ static int pagemap_pmd_range(pmd_t *pmdp
break;
if (pm->show_pfn && (flags & PM_PRESENT))
frame++;
- else if (flags | PM_SWAP)
+ else if (flags & PM_SWAP)
frame += (1 << MAX_SWAPFILES_SHIFT);
}
spin_unlock(ptl);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-gup_benchmark-handle-gup-failures-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
z3fold-fix-memory-leak-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
fs-reiserfs-journalc-add-missing-resierfs_warning-arg.patch
ipc-shmc-shm_split-remove-unneeded-test-for-null-shm_file_datavm_ops.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
linux-next-fixup.patch
fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-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
