The patch titled
Subject: mm-show-proportional-swap-share-of-the-mapping-fix
has been removed from the -mm tree. Its filename was
mm-show-proportional-swap-share-of-the-mapping-fix.patch
This patch was dropped because it was folded into mm-show-proportional-swap-share-of-the-mapping.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-show-proportional-swap-share-of-the-mapping-fix
simplify kunmap_atomic() call
Cc: Bongkyu Kim <bongkyu.kim@xxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swapfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/swapfile.c~mm-show-proportional-swap-share-of-the-mapping-fix mm/swapfile.c
--- a/mm/swapfile.c~mm-show-proportional-swap-share-of-the-mapping-fix
+++ a/mm/swapfile.c
@@ -904,8 +904,8 @@ int swp_swapcount(swp_entry_t entry)
do {
page = list_entry(page->lru.next, struct page, lru);
- map = kmap_atomic(page) + offset;
- tmp_count = *map;
+ map = kmap_atomic(page);
+ tmp_count = map[offset];
kunmap_atomic(map);
count += (tmp_count & ~COUNT_CONTINUED) * n;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
dax-revert-userfaultfd-change.patch
mm-show-proportional-swap-share-of-the-mapping.patch
mm-improve-__gfp_noretry-comment-based-on-implementation-fix.patch
memcg-export-struct-mem_cgroup-fix.patch
memcg-export-struct-mem_cgroup-fix-2.patch
mm-hugetlb-add-cache-of-descriptors-to-resv_map-for-region_add-fix.patch
x86-use-generic-early-mem-copy-fix.patch
mm-mmap-simplify-the-failure-return-working-flow-fix.patch
zswap-dynamic-pool-creation-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
