aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2010-08-09 20:19:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 23:45:02 -0400
commit74bcbf40546bb7500f2a7ba4ff3cc056a6bd004a (patch)
tree39411d83f448da818368043af9b52e9b405a2002
parentcef1d3523d33ebc35fc29e454b1f4bab953fabbf (diff)
oom: move badness() declaration into oom.h
Cc: Minchan Kim <minchan.kim@gmail.com> Cc: David Rientjes <rientjes@google.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.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>
-rw-r--r--fs/proc/base.c3
-rw-r--r--include/linux/oom.h6
2 files changed, 6 insertions, 3 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index fc23f62bb0b8..5949d0ac30f2 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -427,9 +427,6 @@ static const struct file_operations proc_lstats_operations = {
427 427
428#endif 428#endif
429 429
430/* The badness from the OOM killer */
431unsigned long badness(struct task_struct *p, struct mem_cgroup *mem,
432 nodemask_t *nodemask, unsigned long uptime);
433static int proc_oom_score(struct task_struct *task, char *buffer) 430static int proc_oom_score(struct task_struct *task, char *buffer)
434{ 431{
435 unsigned long points = 0; 432 unsigned long points = 0;
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 9d7c34a741e7..40e5e3a6bc20 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -14,6 +14,8 @@
14 14
15struct zonelist; 15struct zonelist;
16struct notifier_block; 16struct notifier_block;
17struct mem_cgroup;
18struct task_struct;
17 19
18/* 20/*
19 * Types of limitations to the nodes from which allocations may occur 21 * Types of limitations to the nodes from which allocations may occur
@@ -45,6 +47,10 @@ static inline void oom_killer_enable(void)
45 oom_killer_disabled = false; 47 oom_killer_disabled = false;
46} 48}
47 49
50/* The badness from the OOM killer */
51extern unsigned long badness(struct task_struct *p, struct mem_cgroup *mem,
52 const nodemask_t *nodemask, unsigned long uptime);
53
48/* sysctls */ 54/* sysctls */
49extern int sysctl_oom_dump_tasks; 55extern int sysctl_oom_dump_tasks;
50extern int sysctl_oom_kill_allocating_task; 56extern int sysctl_oom_kill_allocating_task;