summaryrefslogtreecommitdiffstats
path: root/mm/swapfile.c
diff options
context:
space:
mode:
authorYu Zhao <yuzhao@google.com>2020-10-14 01:52:08 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-14 03:38:30 +0200
commitcc2828b21c764f901128ca2e7b9f056d0e72104f (patch)
tree80cd5452753590e8d9e5627dcd2bfe7adcf6ff2e /mm/swapfile.c
parentswap: rename SWP_FS to SWAP_FS_OPS to avoid ambiguity (diff)
downloadlinux-cc2828b21c764f901128ca2e7b9f056d0e72104f.tar.xz
linux-cc2828b21c764f901128ca2e7b9f056d0e72104f.zip
mm: remove activate_page() from unuse_pte()
We don't initially add anon pages to active lruvec after commit b518154e59aa ("mm/vmscan: protect the workingset on anonymous LRU"). Remove activate_page() from unuse_pte(), which seems to be missed by the commit. And make the function static while we are at it. Before the commit, we called lru_cache_add_active_or_unevictable() to add new ksm pages to active lruvec. Therefore, activate_page() wasn't necessary for them in the first place. Signed-off-by: Yu Zhao <yuzhao@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Yang Shi <shy828301@gmail.com> Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com> Cc: Huang Ying <ying.huang@intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Qian Cai <cai@lca.pw> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Hugh Dickins <hughd@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Link: http://lkml.kernel.org/r/20200818184704.3625199-1-yuzhao@google.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/swapfile.c')
-rw-r--r--mm/swapfile.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 183b87bc87cc..d5c19d0baf06 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1929,11 +1929,6 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd,
lru_cache_add_inactive_or_unevictable(page, vma);
}
swap_free(entry);
- /*
- * Move the page to the active list so it is not
- * immediately swapped out again after swapon.
- */
- activate_page(page);
out:
pte_unmap_unlock(pte, ptl);
if (page != swapcache) {