diff options
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 96473b482099..320d74e707af 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -125,8 +125,7 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) | |||
125 | * Superuser processes are usually more important, so we make it | 125 | * Superuser processes are usually more important, so we make it |
126 | * less likely that we kill those. | 126 | * less likely that we kill those. |
127 | */ | 127 | */ |
128 | if (cap_t(p->cap_effective) & CAP_TO_MASK(CAP_SYS_ADMIN) || | 128 | if (__capable(p, CAP_SYS_ADMIN) || p->uid == 0 || p->euid == 0) |
129 | p->uid == 0 || p->euid == 0) | ||
130 | points /= 4; | 129 | points /= 4; |
131 | 130 | ||
132 | /* | 131 | /* |
@@ -135,7 +134,7 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) | |||
135 | * tend to only have this flag set on applications they think | 134 | * tend to only have this flag set on applications they think |
136 | * of as important. | 135 | * of as important. |
137 | */ | 136 | */ |
138 | if (cap_t(p->cap_effective) & CAP_TO_MASK(CAP_SYS_RAWIO)) | 137 | if (__capable(p, CAP_SYS_RAWIO)) |
139 | points /= 4; | 138 | points /= 4; |
140 | 139 | ||
141 | /* | 140 | /* |