diff options
author | Vladimir Davydov <vdavydov@virtuozzo.com> | 2016-07-26 18:22:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 19:19:19 -0400 |
commit | 2a966b77ae3ede207e787e7538b87d1011c4364e (patch) | |
tree | b6fe80a56c921cb230443eff6bee65aa2372883c /mm/page_alloc.c | |
parent | 798fd756952c4b6cb7dfe6f6437e9f02da79a5bc (diff) |
mm: oom: add memcg to oom_control
It's a part of oom context just like allocation order and nodemask, so
let's move it to oom_control instead of passing it in the argument list.
Link: http://lkml.kernel.org/r/40e03fd7aaf1f55c75d787128d6d17c5a71226c2.1464358556.git.vdavydov@virtuozzo.com
Signed-off-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8129922a1504..f7bb1aef54f2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -3105,6 +3105,7 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, | |||
3105 | struct oom_control oc = { | 3105 | struct oom_control oc = { |
3106 | .zonelist = ac->zonelist, | 3106 | .zonelist = ac->zonelist, |
3107 | .nodemask = ac->nodemask, | 3107 | .nodemask = ac->nodemask, |
3108 | .memcg = NULL, | ||
3108 | .gfp_mask = gfp_mask, | 3109 | .gfp_mask = gfp_mask, |
3109 | .order = order, | 3110 | .order = order, |
3110 | }; | 3111 | }; |