diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-08-24 15:25:56 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-08-24 15:25:56 -0700 |
| commit | fcbc329fa39ef261ba9072c56c63563423bff798 (patch) | |
| tree | 2be4883f0089822d4436a8e6a5ba9032f9a025f5 /mm/madvise.c | |
| parent | a644b0abbfe1d7cf775082cafdcc7b5f3c35becf (diff) | |
| parent | e5548f85b4527c4c803b7eae7887c10bf8f90c97 (diff) | |
| download | linux-stable-fcbc329fa39ef261ba9072c56c63563423bff798.tar.gz linux-stable-fcbc329fa39ef261ba9072c56c63563423bff798.tar.bz2 linux-stable-fcbc329fa39ef261ba9072c56c63563423bff798.zip | |
merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes
Diffstat (limited to 'mm/madvise.c')
| -rw-r--r-- | mm/madvise.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/madvise.c b/mm/madvise.c index 1fb2a11d77d9..b1f53a95e3a5 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -383,7 +383,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, folio = pfn_folio(pmd_pfn(orig_pmd)); /* Do not interfere with other mappings of this folio */ - if (folio_mapcount(folio) != 1) + if (folio_estimated_sharers(folio) != 1) goto huge_unlock; if (pageout_anon_only_filter && !folio_test_anon(folio)) @@ -459,7 +459,7 @@ regular_folio: if (folio_test_large(folio)) { int err; - if (folio_mapcount(folio) != 1) + if (folio_estimated_sharers(folio) != 1) break; if (pageout_anon_only_filter && !folio_test_anon(folio)) break; @@ -683,7 +683,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, if (folio_test_large(folio)) { int err; - if (folio_mapcount(folio) != 1) + if (folio_estimated_sharers(folio) != 1) break; if (!folio_trylock(folio)) break; |