[folded-merged] mm-fix-oom_kill-event-handling-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-fix-oom_kill-event-handling-fix
has been removed from the -mm tree.  Its filename was
     mm-fix-oom_kill-event-handling-fix.patch

This patch was dropped because it was folded into mm-fix-oom_kill-event-handling.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-fix-oom_kill-event-handling-fix

fix it for droppage of memcg-replace-mm-owner-with-mm-memcg.patch

Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/memcontrol.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN include/linux/memcontrol.h~mm-fix-oom_kill-event-handling-fix include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~mm-fix-oom_kill-event-handling-fix
+++ a/include/linux/memcontrol.h
@@ -762,7 +762,7 @@ static inline void memcg_memory_event_mm
 		return;
 
 	rcu_read_lock();
-	memcg = rcu_dereference(mm->memcg);
+	memcg = mem_cgroup_from_task(rcu_dereference(mm->owner));
 	if (likely(memcg))
 		memcg_memory_event(memcg, event);
 	rcu_read_unlock();
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

mm-fix-oom_kill-event-handling.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux