---

yaml --- r: 83114 b: refs/heads/master c: 9782995 h: refs/heads/master v: v3
git-mirror · Feb 5, 2008 · 77cd882 · 77cd882
1 parent 5994e91
commit 77cd882
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 
 	/*