aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2017-05-26 11:32:03 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2017-05-29 09:22:14 +1000
commit09eb5f24e896cbe3fe9e9bfef14159c843cb8b24 (patch)
tree568c98e5f7c7112796d26604d144e0d3c1e32544
parente886ed5d5840158f39ab1a9066a49e0305f8d645 (diff)
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@google.com> Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Cc: Michal Hocko <mhocko@kernel.org> Cc: Roman Guschin <guroan@gmail.com> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Roman Gushchin <guro@fb.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--mm/oom_kill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index dd30a045ef5b..db209e1a4be6 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -879,7 +879,7 @@ static void oom_kill_process(struct oom_control *oc, const char *message)
/* 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