From 2d6d11b40f90779144f5133a1c2bb146c4df6c8f Mon Sep 17 00:00:00 2001
From: Qinghuang Feng <qhfeng.kernel@gmail.com>
Date: Thu, 6 Nov 2008 12:53:34 -0800
Subject: [PATCH] --- yaml --- r: 118441 b: refs/heads/master c:
 fbdd12676c83df77480f00ebd32fc98fbe3bf836 h: refs/heads/master i:   118439:
 23dee9d0fbaa185a043dd35c15ca19646091e8db v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ad65f0744ceb..afea515922de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd96feb2583688ad13d8467ded442f9c8d73cc4b
+refs/heads/master: fbdd12676c83df77480f00ebd32fc98fbe3bf836
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 2846a58e5de9..a0a01902f551 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -38,7 +38,6 @@ static DEFINE_SPINLOCK(zone_scan_mutex);
  * badness - calculate a numeric value for how bad this task has been
  * @p: task struct of which task we should calculate
  * @uptime: current uptime in seconds
- * @mem: target memory controller
  *
  * The formula used is relatively simple and documented inline in the
  * function. The main rationale is that we want to select a good task