The patch titled
Subject: mm-fix-oom_kill-event-handling-fix
has been added to the -mm tree. Its filename is
mm-fix-oom_kill-event-handling-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-fix-oom_kill-event-handling-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-fix-oom_kill-event-handling-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-fix-oom_kill-event-handling-fix
fix it for droppage of memcg-replace-mm-owner-with-mm-memcg.patch
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memcontrol.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN include/linux/memcontrol.h~mm-fix-oom_kill-event-handling-fix include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~mm-fix-oom_kill-event-handling-fix
+++ a/include/linux/memcontrol.h
@@ -762,7 +762,7 @@ static inline void memcg_memory_event_mm
return;
rcu_read_lock();
- memcg = rcu_dereference(mm->memcg);
+ memcg = mem_cgroup_from_task(rcu_dereference(mm->owner));
if (likely(memcg))
memcg_memory_event(memcg, event);
rcu_read_unlock();
diff -puN mm/memcontrol.c~mm-fix-oom_kill-event-handling-fix mm/memcontrol.c
diff -puN mm/oom_kill.c~mm-fix-oom_kill-event-handling-fix mm/oom_kill.c
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-skip-branch-in-proc-lookup-fix.patch
kcov-prefault-the-kcov_area-fix.patch
kcov-prefault-the-kcov_area-fix-fix.patch
kcov-prefault-the-kcov_area-fix-fix-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
mm-fix-oom_kill-event-handling-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
