diff --git a/[refs] b/[refs] index e9175e594576..da88a4e893ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c12ddba09394c60e1120e6997794fa6ed52da884 +refs/heads/master: e638c1394010859a015a3b533ee452d768e62cea diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h index 18146c980b68..a9e3b76aa884 100644 --- a/trunk/include/linux/memcontrol.h +++ b/trunk/include/linux/memcontrol.h @@ -75,7 +75,7 @@ int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) { struct mem_cgroup *mem; rcu_read_lock(); - mem = mem_cgroup_from_task((mm)->owner); + mem = mem_cgroup_from_task(rcu_dereference((mm)->owner)); rcu_read_unlock(); return cgroup == mem; }