---

yaml --- r: 207263 b: refs/heads/master c: 74bcbf4 h: refs/heads/master i: 207261: a4f4666 207259: 0763b79 207255: db37c54 207247: 020ac86 207231: 4d730c3 v: v3
git-mirror · Aug 10, 2010 · c27daef · c27daef
1 parent 06f100b
commit c27daef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cef1d3523d33ebc35fc29e454b1f4bab953fabbf
+refs/heads/master: 74bcbf40546bb7500f2a7ba4ff3cc056a6bd004a
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
@@ -427,9 +427,6 @@ static const struct file_operations proc_lstats_operations = {
 
 #endif
 
-/* The badness from the OOM killer */
-unsigned long badness(struct task_struct *p, struct mem_cgroup *mem,
-		      nodemask_t *nodemask, unsigned long uptime);
 static int proc_oom_score(struct task_struct *task, char *buffer)
 {
 	unsigned long points = 0;

diff --git a/trunk/include/linux/oom.h b/trunk/include/linux/oom.h
@@ -14,6 +14,8 @@
 
 struct zonelist;
 struct notifier_block;
+struct mem_cgroup;
+struct task_struct;
 
 /*
  * Types of limitations to the nodes from which allocations may occur
@@ -45,6 +47,10 @@ static inline void oom_killer_enable(void)
 	oom_killer_disabled = false;
 }
 
+/* The badness from the OOM killer */
+extern unsigned long badness(struct task_struct *p, struct mem_cgroup *mem,
+		      const nodemask_t *nodemask, unsigned long uptime);
+
 /* sysctls */
 extern int sysctl_oom_dump_tasks;
 extern int sysctl_oom_kill_allocating_task;