[PATCH] oom-killer disable for iscsi/lvm2/multipath userland critical sections

[deliverable/linux.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index dad8ea4e00a03efae08302c41e8951eb84eb811e..39fd336cfdb9ca68c354a22f432e74c63a9bf732 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -751,7 +751,7 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
        if (copy_from_user(buffer, buf, count))
                return -EFAULT;
        oom_adjust = simple_strtol(buffer, &end, 0);
-       if (oom_adjust < -16 || oom_adjust > 15)
+       if ((oom_adjust < -16 || oom_adjust > 15) && oom_adjust != OOM_DISABLE)
                return -EINVAL;
        if (*end == '\n')
                end++;