From b1c6f8163f28c18ff21f62570ab5e1451154c85a Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Tue, 11 Dec 2012 16:00:26 -0800 Subject: [PATCH] --- yaml --- r: 338721 b: refs/heads/master c: 19965460e31c73a934d2c19c152f876a75bdff3e h: refs/heads/master i: 338719: df1b992985d97af98e5ccd1ddd1cba13736dea76 v: v3 --- [refs] | 2 +- trunk/include/linux/oom.h | 2 -- trunk/mm/memcontrol.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8fc53c387da1..5e142201b6e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 377e4f167664d8bc390c04c911d846366000159c +refs/heads/master: 19965460e31c73a934d2c19c152f876a75bdff3e diff --git a/trunk/include/linux/oom.h b/trunk/include/linux/oom.h index fb9826847b89..4a4188da4570 100644 --- a/trunk/include/linux/oom.h +++ b/trunk/include/linux/oom.h @@ -49,8 +49,6 @@ extern void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask, extern enum oom_scan_t oom_scan_process_thread(struct task_struct *task, unsigned long totalpages, const nodemask_t *nodemask, bool force_kill); -extern void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, - int order); extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order, nodemask_t *mask, bool force_kill); diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index dd39ba000b31..cf6d0df4849c 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -1498,8 +1498,8 @@ static u64 mem_cgroup_get_limit(struct mem_cgroup *memcg) return limit; } -void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, - int order) +static void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, + int order) { struct mem_cgroup *iter; unsigned long chosen_points = 0;