projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
memcg: change oom_info_lock to mutex
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
memcontrol.c
diff --git
a/mm/memcontrol.c
b/mm/memcontrol.c
index
53385cd
..
ce7a8cc
100644
(file)
--- a/
mm/memcontrol.c
+++ b/
mm/memcontrol.c
@@
-1687,7
+1687,7
@@
void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
* protects memcg_name and makes sure that parallel ooms do not
* interleave
*/
* protects memcg_name and makes sure that parallel ooms do not
* interleave
*/
- static DEFINE_
SPINLOCK
(oom_info_lock);
+ static DEFINE_
MUTEX
(oom_info_lock);
struct cgroup *task_cgrp;
struct cgroup *mem_cgrp;
static char memcg_name[PATH_MAX];
struct cgroup *task_cgrp;
struct cgroup *mem_cgrp;
static char memcg_name[PATH_MAX];
@@
-1698,7
+1698,7
@@
void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
if (!p)
return;
if (!p)
return;
-
spin
_lock(&oom_info_lock);
+
mutex
_lock(&oom_info_lock);
rcu_read_lock();
mem_cgrp = memcg->css.cgroup;
rcu_read_lock();
mem_cgrp = memcg->css.cgroup;
@@
-1767,7
+1767,7
@@
done:
pr_cont("\n");
}
pr_cont("\n");
}
-
spin
_unlock(&oom_info_lock);
+
mutex
_unlock(&oom_info_lock);
}
/*
}
/*