From 48bce6f4fb1748810d4014c1cfd9855f03de50c1 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Tue, 11 Nov 2008 22:02:54 +1100 Subject: [PATCH] --- yaml --- r: 120655 b: refs/heads/master c: a2f2945a99057c7d44043465906c6bb63c3368a0 h: refs/heads/master i: 120653: e5bc209596221a32b2d4f161545f7f097798ff56 120651: f19ddaa7f9cca1bdf5211eb490e408b41578f254 120647: 058f5eed4e31add69a1d4212594b6da1e776f1ac 120639: e031fcdf655195a12c21687b11dc78320e8381ce v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0d7e5305dcb2..e4d41d9e3c11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06112163f5fd9e491a7f810443d81efa9d88e247 +refs/heads/master: a2f2945a99057c7d44043465906c6bb63c3368a0 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 64e5b4bcd964..34a458aa7997 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -129,8 +129,8 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) * Superuser processes are usually more important, so we make it * less likely that we kill those. */ - if (has_capability(p, CAP_SYS_ADMIN) || - has_capability(p, CAP_SYS_RESOURCE)) + if (has_capability_noaudit(p, CAP_SYS_ADMIN) || + has_capability_noaudit(p, CAP_SYS_RESOURCE)) points /= 4; /* @@ -139,7 +139,7 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) * tend to only have this flag set on applications they think * of as important. */ - if (has_capability(p, CAP_SYS_RAWIO)) + if (has_capability_noaudit(p, CAP_SYS_RAWIO)) points /= 4; /*