From c61eea9459045c2c9032a0c98234985a371fac58 Mon Sep 17 00:00:00 2001 From: Luca Tettamanti Date: Mon, 23 Aug 2010 14:35:37 +0200 Subject: [PATCH] Add support for oom_score_adj /proc//oom_adj has been deprecated (kernel v2.6.36) due to the rework of the badness heuristic; oom_score_adj is the replacement. Keep a fallback to the old interface for compatibility with older kernels. See http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a63d83f427fbce97a6cea0db2e64b0eb8435cd10 Signed-off-by: Martin Pitt --- udev/udevd.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/udev/udevd.c b/udev/udevd.c index 374a4e0bc..0ec3c3d4e 100644 --- a/udev/udevd.c +++ b/udev/udevd.c @@ -1285,12 +1285,19 @@ int main(int argc, char *argv[]) fclose(f); } - /* OOM_DISABLE == -17 */ - fd = open("/proc/self/oom_adj", O_RDWR); + fd = open("/proc/self/oom_score_adj", O_RDWR); if (fd < 0) { - err(udev, "error disabling OOM: %m\n"); + /* Fallback to old interface */ + fd = open("/proc/self/oom_adj", O_RDWR); + if (fd < 0) { + err(udev, "error disabling OOM: %m\n"); + } else { + /* OOM_DISABLE == -17 */ + write(fd, "-17", 3); + close(fd); + } } else { - write(fd, "-17", 3); + write(fd, "-1000", 5); close(fd); } -- 2.30.2