diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-08-22 00:26:20 +0300 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-08-22 00:26:20 +0300 |
| commit | 5994eabf3bbbea550166ae90de0c854fc984c95d (patch) | |
| tree | 6b242a70d3254c408c68157a5f5b2fa7eb9f6a4b /mm/memcontrol.c | |
| parent | e45a2e947dfa6da2d73e2cf91ed6399c12522d4f (diff) | |
| parent | 6867c7a3320669cbe44b905a3eb35db725c6d470 (diff) | |
| download | linux-5994eabf3bbbea550166ae90de0c854fc984c95d.tar.xz | |
merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d83f99580900..8e125aa5a18d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6013,6 +6013,7 @@ static int mem_cgroup_count_precharge_pte_range(pmd_t *pmd, static const struct mm_walk_ops precharge_walk_ops = { .pmd_entry = mem_cgroup_count_precharge_pte_range, + .walk_lock = PGWALK_RDLOCK, }; static unsigned long mem_cgroup_count_precharge(struct mm_struct *mm) @@ -6292,6 +6293,7 @@ put: /* get_mctgt_type() gets & locks the page */ static const struct mm_walk_ops charge_walk_ops = { .pmd_entry = mem_cgroup_move_charge_pte_range, + .walk_lock = PGWALK_RDLOCK, }; static void mem_cgroup_move_charge(void) |