The patch titled
     mm/migrate.c: don't account swapcache as shmem
has been removed from the -mm tree.  Its filename was
     mm-migratec-dont-account-swapcache-as-shmem.patch

This patch was dropped because an alternative patch was merged

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: mm/migrate.c: don't account swapcache as shmem
From: Andrea Arcangeli <aarca...@redhat.com>

swapcache will reach the below code path in migrate_page_move_mapping,
and swapcache is accounted as NR_FILE_PAGES but it's not accounted as
NR_SHMEM.

This can make the NR_SHMEM counter underflow.

Signed-off-by: Andrea Arcangeli <aarca...@redhat.com>
Reviewed-by: Minchan Kim <minchan....@gmail.com>
Acked-by: Mel Gorman <mgor...@suse.de>
Cc: KOSAKI Motohiro <kosaki.motoh...@jp.fujitsu.com>
Cc: Hugh Dickins <hu...@google.com>
Cc: <sta...@kernel.org>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
---

 mm/migrate.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/migrate.c~mm-migratec-dont-account-swapcache-as-shmem mm/migrate.c
--- a/mm/migrate.c~mm-migratec-dont-account-swapcache-as-shmem
+++ a/mm/migrate.c
@@ -288,7 +288,7 @@ static int migrate_page_move_mapping(str
         */
        __dec_zone_page_state(page, NR_FILE_PAGES);
        __inc_zone_page_state(newpage, NR_FILE_PAGES);
-       if (PageSwapBacked(page)) {
+       if (mapping != &swapper_space && PageSwapBacked(page)) {
                __dec_zone_page_state(page, NR_SHMEM);
                __inc_zone_page_state(newpage, NR_SHMEM);
        }
_

Patches currently in -mm which might be from aarca...@redhat.com are

origin.patch
pagewalk-fix-walk_page_range-dont-check-find_vma-result-properly.patch
pagewalk-dont-look-up-vma-if-walk-hugetlb_entry-is-unused.patch
pagewalk-add-locking-rule-comments.patch
pagewalk-add-locking-rule-comments-fix.patch
pagewalk-fix-code-comment-for-thp.patch

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to