diff options
| author | David Rientjes <rientjes@google.com> | 2012-12-11 16:00:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 17:22:22 -0800 |
| commit | 19965460e31c73a934d2c19c152f876a75bdff3e (patch) | |
| tree | 662e3de7f6015225b650f8a24fbacf8b33938714 | |
| parent | 377e4f167664d8bc390c04c911d846366000159c (diff) | |
| download | olio-linux-3.10-19965460e31c73a934d2c19c152f876a75bdff3e.tar.xz olio-linux-3.10-19965460e31c73a934d2c19c152f876a75bdff3e.zip | |
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>
Acked-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/oom.h | 2 | ||||
| -rw-r--r-- | mm/memcontrol.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h index fb9826847b8..4a4188da457 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 dd39ba000b3..cf6d0df4849 100644 --- a/mm/memcontrol.c +++ b/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; |