diff options
| author | Andrea Arcangeli <andrea@suse.de> | 2005-04-17 02:24:05 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 02:24:05 +0400 |
| commit | 79befd0c08c4766f8fa27e37ac2a70e40840a56a (patch) | |
| tree | d0600c289b1a54902e3b78eec0729dc7011569a3 /mm | |
| parent | d345734267dbec642f4e34a9d392d2fd85b5fa9b (diff) | |
| download | linux-79befd0c08c4766f8fa27e37ac2a70e40840a56a.tar.xz | |
[PATCH] oom-killer disable for iscsi/lvm2/multipath userland critical sections
iscsi/lvm2/multipath needs guaranteed protection from the oom-killer, so
make the magical value of -17 in /proc/<pid>/oom_adj defeat the oom-killer
altogether.
(akpm: we still need to document oom_adj and friends in
Documentation/filesystems/proc.txt!)
Signed-off-by: Andrea Arcangeli <andrea@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/oom_kill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 9595a0f6c4b8..4bbb1cb10495 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -145,7 +145,7 @@ static struct task_struct * select_bad_process(void) do_posix_clock_monotonic_gettime(&uptime); do_each_thread(g, p) /* skip the init task with pid == 1 */ - if (p->pid > 1) { + if (p->pid > 1 && p->oomkilladj != OOM_DISABLE) { unsigned long points; /* |