The patch titled
Subject: mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix
has been removed from the -mm tree. Its filename was
mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix.patch
This patch was dropped because it was folded into mm-oom_kill-count-global-and-memory-cgroup-oom-kills.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix
"mm: per-cgroup memory reclaim stats" renamed mem_cgroup_count_vm_event()
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Roman Guschin <guroan@xxxxxxxxx>
Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/oom_kill.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/oom_kill.c~mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix mm/oom_kill.c
--- a/mm/oom_kill.c~mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix
+++ a/mm/oom_kill.c
@@ -879,7 +879,7 @@ static void oom_kill_process(struct oom_
/* Raise event before sending signal: reaper must see this */
count_vm_event(OOM_KILL);
- mem_cgroup_count_vm_event(mm, OOM_KILL);
+ count_memcg_event_mm(mm, OOM_KILL);
/*
* We should send SIGKILL before setting TIF_MEMDIE in order to prevent
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-oom_kill-count-global-and-memory-cgroup-oom-kills.patch
mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix-fix.patch
mm-swap-sort-swap-entries-before-free-fix.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
