diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-08-21 23:26:20 +0200 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-08-21 23:26:20 +0200 |
| commit | 5994eabf3bbbea550166ae90de0c854fc984c95d (patch) | |
| tree | 6b242a70d3254c408c68157a5f5b2fa7eb9f6a4b /mm/madvise.c | |
| parent | pagemap: remove wait_on_page_locked_killable() (diff) | |
| parent | mm: multi-gen LRU: don't spin during memcg release (diff) | |
| download | linux-5994eabf3bbbea550166ae90de0c854fc984c95d.tar.xz linux-5994eabf3bbbea550166ae90de0c854fc984c95d.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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/madvise.c b/mm/madvise.c index 8498f700c284..1fb2a11d77d9 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -232,6 +232,7 @@ static int swapin_walk_pmd_entry(pmd_t *pmd, unsigned long start, static const struct mm_walk_ops swapin_walk_ops = { .pmd_entry = swapin_walk_pmd_entry, + .walk_lock = PGWALK_RDLOCK, }; static void shmem_swapin_range(struct vm_area_struct *vma, @@ -537,6 +538,7 @@ regular_folio: static const struct mm_walk_ops cold_walk_ops = { .pmd_entry = madvise_cold_or_pageout_pte_range, + .walk_lock = PGWALK_RDLOCK, }; static void madvise_cold_page_range(struct mmu_gather *tlb, @@ -760,6 +762,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, static const struct mm_walk_ops madvise_free_walk_ops = { .pmd_entry = madvise_free_pte_range, + .walk_lock = PGWALK_RDLOCK, }; static int madvise_free_single_vma(struct vm_area_struct *vma, |