diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-14 22:26:55 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-14 22:26:55 +0300 |
| commit | decd6167bf4f6bec1284006d0522381b44660df3 (patch) | |
| tree | 40de7c0a7f285336e1c380ab6673cd133685a8c9 /include/linux | |
| parent | 8c1684bb81f173543599f1848c29a2a3b1ee5907 (diff) | |
| parent | 13cf04880235cd70d408d70426ada31408ded2ee (diff) | |
| download | linux-decd6167bf4f6bec1284006d0522381b44660df3.tar.xz | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"7 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
kasan: add missing functions declarations to kasan.h
kasan: consistently disable debugging features
ipc/util.c: sysvipc_find_ipc() incorrectly updates position index
userfaultfd: fix remap event with MREMAP_DONTUNMAP
mm/gup: fix fixup_user_fault() on multiple retries
epoll: call final ep_events_available() check under the lock
mm, memcg: fix inconsistent oom event behavior
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/memcontrol.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d275c72c4f8e..977edd3b7bd8 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -783,6 +783,8 @@ static inline void memcg_memory_event(struct mem_cgroup *memcg, atomic_long_inc(&memcg->memory_events[event]); cgroup_file_notify(&memcg->events_file); + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) + break; if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_LOCAL_EVENTS) break; } while ((memcg = parent_mem_cgroup(memcg)) && |