diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-10-20 02:28:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:38 -0400 |
commit | 8ac773b4f73afa6fd66695131103944b975d5d5c (patch) | |
tree | 7a3ea0d703cde009c5f2e1196d80f06cf5d00d54 /fs/proc/base.c | |
parent | 887b95931b4072e60e3bf4253ff7bffe372bca46 (diff) |
[PATCH] OOM killer meets userspace headers
Despite mm.h is not being exported header, it does contain one thing
which is part of userspace ABI -- value disabling OOM killer for given
process. So,
a) create and export include/linux/oom.h
b) move OOM_DISABLE define there.
c) turn bounding values of /proc/$PID/oom_adj into defines and export
them too.
Note: mass __KERNEL__ removal will be done later.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 26a8f8416b79..8df27401d292 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -72,6 +72,7 @@ | |||
72 | #include <linux/audit.h> | 72 | #include <linux/audit.h> |
73 | #include <linux/poll.h> | 73 | #include <linux/poll.h> |
74 | #include <linux/nsproxy.h> | 74 | #include <linux/nsproxy.h> |
75 | #include <linux/oom.h> | ||
75 | #include "internal.h" | 76 | #include "internal.h" |
76 | 77 | ||
77 | /* NOTE: | 78 | /* NOTE: |
@@ -689,7 +690,8 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf, | |||
689 | if (copy_from_user(buffer, buf, count)) | 690 | if (copy_from_user(buffer, buf, count)) |
690 | return -EFAULT; | 691 | return -EFAULT; |
691 | oom_adjust = simple_strtol(buffer, &end, 0); | 692 | oom_adjust = simple_strtol(buffer, &end, 0); |
692 | if ((oom_adjust < -16 || oom_adjust > 15) && oom_adjust != OOM_DISABLE) | 693 | if ((oom_adjust < OOM_ADJUST_MIN || oom_adjust > OOM_ADJUST_MAX) && |
694 | oom_adjust != OOM_DISABLE) | ||
693 | return -EINVAL; | 695 | return -EINVAL; |
694 | if (*end == '\n') | 696 | if (*end == '\n') |
695 | end++; | 697 | end++; |