oom: remove references to old badness() function

The badness() function in the oom killer was renamed to oom_badness() in
a63d83f427fb ("oom: badness heuristic rewrite") since it is a globally
exported function for clarity.

The prototype for the old function still existed in linux/oom.h, so remove
it.  There are no existing users.

Also fixes documentation and comment references to badness() and adjusts
them accordingly.

Signed-off-by: David Rientjes <rientjes@google.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/ABI/obsolete/proc-pid-oom_adj b/Documentation/ABI/obsolete/proc-pid-oom_adj
index cf63f264ce0fe7128b68f5294cd223e49f5d3073..9a3cb88ade478742e7b60cb2787bd589e210589c 100644 (file)
--- a/Documentation/ABI/obsolete/proc-pid-oom_adj
+++ b/Documentation/ABI/obsolete/proc-pid-oom_adj
@@ -14,7 +14,7 @@ Why:  /proc/<pid>/oom_adj allows userspace to influence the oom killer's
 
        A much more powerful interface, /proc/<pid>/oom_score_adj, was
        introduced with the oom killer rewrite that allows users to increase or
-       decrease the badness() score linearly.  This interface will replace
+       decrease the badness score linearly.  This interface will replace
        /proc/<pid>/oom_adj.
 
        A warning will be emitted to the kernel log if an application uses this

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index f9d240dfac0695dd547de81d696365ee4207fee7..d093e550dbeb3e4faad2d5cf33dc2d2f9383c8e1 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -184,7 +184,7 @@ Why:        /proc/<pid>/oom_adj allows userspace to influence the oom killer's
 
        A much more powerful interface, /proc/<pid>/oom_score_adj, was
        introduced with the oom killer rewrite that allows users to increase or
-       decrease the badness() score linearly.  This interface will replace
+       decrease the badness score linearly.  This interface will replace
        /proc/<pid>/oom_adj.
 
        A warning will be emitted to the kernel log if an application uses this

diff --git a/include/linux/oom.h b/include/linux/oom.h
index 4952fb874ad3dadd631b3e10f0ae35eb0df59135..13b7b02e599aed40fcf09c2eea96dc0f03dc3d32 100644 (file)
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -64,10 +64,6 @@ 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);
-
 extern struct task_struct *find_lock_task_mm(struct task_struct *p);
 
 /* sysctls */

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b0be989d43656ce7b19d215a0dbcc450e9c5c510..eafff89b3dd634e8836842005695c1ad48cc0cb2 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -487,7 +487,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 
        /*
         * If any of p's children has a different mm and is eligible for kill,
-        * the one with the highest badness() score is sacrificed for its
+        * the one with the highest oom_badness() score is sacrificed for its
         * parent.  This attempts to lose the minimal amount of work done while
         * still freeing memory.
         */