projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vfs: remove duplicate code in get_fs_type()
[firefly-linux-kernel-4.4.55.git]
/
mm
/
oom_kill.c
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index a0a01902f551dd45b19385b64435ec6708db249d..558f9afe6e4e6b0085ddb51633a8b845e2518d18 100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-128,8
+128,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.
*/
* 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;
/*
points /= 4;
/*
@@
-138,7
+138,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.
*/
* 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;
/*
points /= 4;
/*
@@
-299,9
+299,9
@@
static void dump_tasks(const struct mem_cgroup *mem)
task_lock(p);
printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d %3d %s\n",
task_lock(p);
printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d %3d %s\n",
- p->pid,
p->uid, p->tgid, p->mm->total_vm
,
-
get_mm_rss(p->mm), (int)task_cpu(p), p->oomkilladj
,
- p->comm);
+ p->pid,
__task_cred(p)->uid, p->tgid
,
+
p->mm->total_vm, get_mm_rss(p->mm), (int)task_cpu(p)
,
+ p->
oomkilladj, p->
comm);
task_unlock(p);
} while_each_thread(g, p);
}
task_unlock(p);
} while_each_thread(g, p);
}