From c27daef788edfcf74bc1d7b15597f523ccbf3109 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 9 Aug 2010 17:19:43 -0700
Subject: [PATCH] --- yaml --- r: 207263 b: refs/heads/master c:
 74bcbf40546bb7500f2a7ba4ff3cc056a6bd004a h: refs/heads/master i:   207261:
 a4f466665d26170122b0481243f73739acd575a1   207259:
 0763b79eb7c2a426e0b7a725c50f6a50628bb55f   207255:
 db37c5418fe7f9c4d88fb79cf018009b66f8333f   207247:
 020ac868d9b6fea8388d7c48149a3d9e5bd792b0   207231:
 4d730c35200c4b9a0ce31c9b95cb1a2030ad2139 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/proc/base.c      | 3 ---
 trunk/include/linux/oom.h | 6 ++++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a27bbadfc94f..702b81fca6e1 100644
--- 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
index fc23f62bb0b8..5949d0ac30f2 100644
--- 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
index 9d7c34a741e7..40e5e3a6bc20 100644
--- 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;