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
Showing the changes to include/linux (1 of 7 files). Show all
Unified · Split
| @@ -783,6 +783,8 @@ static inline void memcg_memory_event(struct mem_cgroup *memcg, · 782 unmodified lines | |||
| 783 | atomic_long_inc(&memcg->memory_events[event]); | 783 | atomic_long_inc(&memcg->memory_events[event]); |
| 784 | cgroup_file_notify(&memcg->events_file); | 784 | cgroup_file_notify(&memcg->events_file); |
| 785 | 785 | ||
| 786 | if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) | ||
| 787 | break; | ||
| 786 | if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_LOCAL_EVENTS) | 788 | if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_LOCAL_EVENTS) |
| 787 | break; | 789 | break; |
| 788 | } while ((memcg = parent_mem_cgroup(memcg)) && | 790 | } while ((memcg = parent_mem_cgroup(memcg)) && |