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 <rientjes@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/oom.h b/include/linux/oom.h
index fb9826847b89184d1e3c99b00c0dfcf0f096e1f9..4a4188da45700221af4e7b97200a229a23b29416 100644 (file)
--- 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 7acf43bf04a270cf2bf90f342c66142d1c5cf675..e4e9b18eb43414727b33cddf3edaef0856760d84 100644 (file)
--- 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;