From: David Rientjes Date: Sat, 3 Nov 2012 00:42:12 +0000 (+1100) Subject: mm, memcg: make mem_cgroup_out_of_memory() static X-Git-Tag: next-20121107~2^2~187 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fc9d2eece494de80c337a8452f9561d7468cf46c;p=karo-tx-linux.git mm, memcg: make mem_cgroup_out_of_memory() static mem_cgroup_out_of_memory() is only referenced from within file scope, so it can be marked static. Signed-off-by: David Rientjes Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton --- diff --git a/include/linux/oom.h b/include/linux/oom.h index fb9826847b89..4a4188da4570 100644 --- a/include/linux/oom.h +++ b/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/mm/memcontrol.c b/mm/memcontrol.c index 08adaaae6fcc..284d44594f8d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1465,8 +1465,8 @@ static u64 mem_cgroup_get_limit(struct mem_cgroup *memcg) return min(limit, memsw); } -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;