diff options
| author | Joshua N Pritikin <jpritikin@pobox.com> | 2007-05-06 14:49:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:12:51 -0700 |
| commit | 9a82782f8f58219d0c6dc5f0211ce301adf6c6f4 (patch) | |
| tree | 0caef745a8ef3f96b3e2444d00a5180669e5c469 | |
| parent | 3d67f2d7c0fb28b0eb6a6aa100b190526a971ad9 (diff) | |
| download | lwn-9a82782f8f58219d0c6dc5f0211ce301adf6c6f4.tar.gz lwn-9a82782f8f58219d0c6dc5f0211ce301adf6c6f4.zip | |
allow oom_adj of saintly processes
If the badness of a process is zero then oom_adj>0 has no effect. This
patch makes sure that the oom_adj shift actually increases badness points
appropriately.
Signed-off-by: Joshua N. Pritikin <jpritikin@pobox.com>
Cc: Andrea Arcangeli <andrea@novell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | mm/oom_kill.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 3791edfffeeb..a35e7a8ebd7e 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -147,9 +147,11 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) * Adjust the score by oomkilladj. */ if (p->oomkilladj) { - if (p->oomkilladj > 0) + if (p->oomkilladj > 0) { + if (!points) + points = 1; points <<= p->oomkilladj; - else + } else points >>= -(p->oomkilladj); } |