Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62ce1c70 authored Jul 31, 2012 by David Rientjes Committed by Linus Torvalds Jul 31, 2012

mm, oom: move declaration for mem_cgroup_out_of_memory to oom.h



mem_cgroup_out_of_memory() is defined in mm/oom_kill.c, so declare it in
linux/oom.h rather than linux/memcontrol.h.

Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4ed7e022

include/linux/memcontrol.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -72,8 +72,6 @@ extern void mem_cgroup_uncharge_end(void);
		extern void mem_cgroup_uncharge_page(struct page *page);
		extern void mem_cgroup_uncharge_cache_page(struct page *page);

		extern void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
		int order);
		bool __mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
		struct mem_cgroup *memcg);
		int task_in_mem_cgroup(struct task_struct task, const struct mem_cgroup memcg);

include/linux/oom.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ extern unsigned long oom_badness(struct task_struct *p,
		extern int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
		extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);

		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);
		extern int register_oom_notifier(struct notifier_block *nb);