From 77cd882c469f4d27c692286a6561191bde4feaea Mon Sep 17 00:00:00 2001
From: "Serge E. Hallyn" <serue@us.ibm.com>
Date: Mon, 4 Feb 2008 22:29:47 -0800
Subject: [PATCH] --- yaml --- r: 83114 b: refs/heads/master c:
 97829955ad291acec1d8b94e9911b3ceb1118bb1 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 14da57b9ed21..9177dd2a01f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b7391de67da515c91f48aa371de77cb6cc5c07e
+refs/heads/master: 97829955ad291acec1d8b94e9911b3ceb1118bb1
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 320d74e707af..c1850bf991cd 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -125,7 +125,7 @@ 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 (__capable(p, CAP_SYS_ADMIN) || p->uid == 0 || p->euid == 0)
+	if (__capable(p, CAP_SYS_ADMIN) || __capable(p, CAP_SYS_RESOURCE))
 		points /= 4;
 
 	/*