Skip to content

Commit 62ce1c7

Browse files
rientjestorvalds
authored andcommitted
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>
1 parent 4ed7e02 commit 62ce1c7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/linux/memcontrol.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ extern void mem_cgroup_uncharge_end(void);
7272
extern void mem_cgroup_uncharge_page(struct page *page);
7373
extern void mem_cgroup_uncharge_cache_page(struct page *page);
7474

75-
extern void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
76-
int order);
7775
bool __mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
7876
struct mem_cgroup *memcg);
7977
int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *memcg);

include/linux/oom.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ extern unsigned long oom_badness(struct task_struct *p,
4949
extern int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
5050
extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
5151

52+
extern void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
53+
int order);
5254
extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
5355
int order, nodemask_t *mask, bool force_kill);
5456
extern int register_oom_notifier(struct notifier_block *nb);

0 commit comments

Comments
 (0)