From df047b2870112221f752751df19e1fad3b8a8ed8 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Mon, 25 Jul 2011 17:12:17 -0700 Subject: [PATCH] --- yaml --- r: 258945 b: refs/heads/master c: 11239836c04b50ba8453ec58ca7a7bd716ef02c1 h: refs/heads/master i: 258943: d7d5e59dbf2b9104d832349b72d8386bf96ac7ec v: v3 --- [refs] | 2 +- trunk/Documentation/ABI/obsolete/proc-pid-oom_adj | 2 +- trunk/Documentation/feature-removal-schedule.txt | 2 +- trunk/include/linux/oom.h | 4 ---- trunk/mm/oom_kill.c | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 155c911cfd90..d529c6174d60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ac47520063b230641a64062b8a229201cd0a3a8 +refs/heads/master: 11239836c04b50ba8453ec58ca7a7bd716ef02c1 diff --git a/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj b/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj index cf63f264ce0f..9a3cb88ade47 100644 --- a/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj +++ b/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj @@ -14,7 +14,7 @@ Why: /proc//oom_adj allows userspace to influence the oom killer's A much more powerful interface, /proc//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//oom_adj. A warning will be emitted to the kernel log if an application uses this diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index f9d240dfac06..d093e550dbeb 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -184,7 +184,7 @@ Why: /proc//oom_adj allows userspace to influence the oom killer's A much more powerful interface, /proc//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//oom_adj. A warning will be emitted to the kernel log if an application uses this diff --git a/trunk/include/linux/oom.h b/trunk/include/linux/oom.h index 4952fb874ad3..13b7b02e599a 100644 --- a/trunk/include/linux/oom.h +++ b/trunk/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/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index b0be989d4365..eafff89b3dd6 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/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. */