diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-11-18 14:41:02 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-11-18 14:41:02 +0100 |
commit | b21feab0b865c36b24d7a60b55a10c7033b03159 (patch) | |
tree | 17085747485ffad55b90839b43646d453b8e5079 /mm/memcontrol.c | |
parent | a9723389cc759c891d481de271ac73eeaa123bcb (diff) | |
parent | af42d3466bdc8f39806b26f593604fdc54140bcb (diff) | |
download | linux-b21feab0b865c36b24d7a60b55a10c7033b03159.tar.gz |
Merge tag 'v5.4-rc8' into sched/core, to pick up fixes and dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 37592dd7ae32..46ad252e6d6a 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -960,7 +960,7 @@ struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) if (unlikely(!memcg)) memcg = root_mem_cgroup; } - } while (!css_tryget_online(&memcg->css)); + } while (!css_tryget(&memcg->css)); rcu_read_unlock(); return memcg; } |