[PATCH] NFS: Fix lookup intent handling

[linux-2.6] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 9595a0f6c4b8891d832f109781d460060fada872..4bbb1cb10495ea486db83868055762888835c8b3 100644 (file)
--- 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;
 
                        /*