projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b59265
)
mm: memcontrol: zap oom_info_lock
author
Vladimir Davydov
<
[email protected]
>
Thu, 17 Mar 2016 21:20:34 +0000
(14:20 -0700)
committer
Linus Torvalds
<
[email protected]
>
Thu, 17 Mar 2016 22:09:34 +0000
(15:09 -0700)
mem_cgroup_print_oom_info is always called under oom_lock, so
oom_info_lock is redundant.
Signed-off-by: Vladimir Davydov <
[email protected]
>
Cc: Johannes Weiner <
[email protected]
>
Acked-by: Michal Hocko <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
mm/memcontrol.c
patch
|
blob
|
history
diff --git
a/mm/memcontrol.c
b/mm/memcontrol.c
index fa7bf354ae3204a789ac8868707dff811055508c..36db05fa8acb8b49d95130a00de9b22233dac031 100644
(file)
--- a/
mm/memcontrol.c
+++ b/
mm/memcontrol.c
@@
-1150,12
+1150,9
@@
static bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg)
*/
void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
{
- /* oom_info_lock ensures that parallel ooms do not interleave */
- static DEFINE_MUTEX(oom_info_lock);
struct mem_cgroup *iter;
unsigned int i;
- mutex_lock(&oom_info_lock);
rcu_read_lock();
if (p) {
@@
-1199,7
+1196,6
@@
void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
pr_cont("\n");
}
- mutex_unlock(&oom_info_lock);
}
/*