The patch titled
Subject: mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix
has been removed from the -mm tree. Its filename was
mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix.patch
This patch was dropped because it was folded into mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry.patch
------------------------------------------------------
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>
---
fs/proc/task_mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
@@ -1334,7 +1334,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-pagemap-fix-swap-offset-value-for-pmd-migration-entry.patch
writeback-safer-lock-nesting-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
zram-introduce-zram-memory-tracking-update-fix.patch
mm-check-for-sigkill-inside-dup_mmap-loop-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
mm-oom-cgroup-aware-oom-killer-fix-fix.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
ida-remove-simple_ida_lock-fix.patch
linux-next-git-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.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
