Commit a2e3dfa9 authored by Kefeng Wang's avatar Kefeng Wang
Browse files

s390: use pfn_swap_entry_folio() in ptep_zap_swap_entry() 

mainline inclusion
from mainline-v6.9-rc1
commit 0601ac883a814930c3a38d39a115fdc05179d886
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CHB4
CVE: NA

-------------------------------------------------

Call pfn_swap_entry_folio() in ptep_zap_swap_entry() as preparation for
converting mm counter functions to take a folio.

Link: https://lkml.kernel.org/r/20240111152429.3374566-5-willy@infradead.org


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 0601ac883a814930c3a38d39a115fdc05179d886)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
parent 9c7a682c

arch/s390/mm/pgtable.c

+2 −2
Original line number Diff line number Diff line
@@ -730,9 +730,9 @@ static void ptep_zap_swap_entry(struct mm_struct *mm, swp_entry_t entry) 
	if (!non_swap_entry(entry))

		dec_mm_counter(mm, MM_SWAPENTS);

	else if (is_migration_entry(entry)) {

		struct page *page = pfn_swap_entry_to_page(entry);

		struct folio *folio = pfn_swap_entry_folio(entry);



		dec_mm_counter(mm, mm_counter(page));

		dec_mm_counter(mm, mm_counter(&folio->page));

	}

	free_swap_and_cache(entry);

}