[folded-merged] mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix.patch removed from -mm tree

[folded-merged] mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm/memcg: add missed warning in mem_cgroup_lruvec
has been removed from the -mm tree.  Its filename was
     mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix.patch

This patch was dropped because it was folded into mm-memcontrol-rewrite-mem_cgroup_page_lruvec.patch

------------------------------------------------------
From: Alex Shi <alex.shi@linux.alibaba.com>
Subject: mm/memcg: add missed warning in mem_cgroup_lruvec

commit "(mm/memcontrol:rewrite mem_cgroup_page_lruvec())" on mm tree use
mem_cgroup_lruvec to rewrite mem_cgroup_page_lruvec, but it missed a
DEBUG_VM warning as following, since we always charge a page before
return from allocation. Add back this warning is helpful:

	VM_WARN_ON_ONCE(!memcg);

Link: https://lkml.kernel.org/r/94f17bb7-ec61-5b72-3555-fabeb5a4d73b@linux.alibaba.com
Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Roman Gushchin <guro@fb.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Yafang Shao <laoar.shao@gmail.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: Hui Su <sh_def@163.com>
Cc: Wei Yang <richard.weiyang@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/memcontrol.h |    2 ++
 1 file changed, 2 insertions(+)

--- a/include/linux/memcontrol.h~mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix
+++ a/include/linux/memcontrol.h
@@ -613,6 +613,8 @@ static inline struct lruvec *mem_cgroup_
 	struct mem_cgroup_per_node *mz;
 	struct lruvec *lruvec;
 
+	VM_WARN_ON_ONCE(!memcg);
+
 	if (mem_cgroup_disabled()) {
 		lruvec = &pgdat->__lruvec;
 		goto out;
_

Patches currently in -mm which might be from alex.shi@linux.alibaba.com are

mm-memcg-bail-early-from-swap-accounting-if-memcg-disabled.patch
mm-memcg-warning-on-memcg-after-readahead-page-charged.patch
mm-memcontrol-rewrite-mem_cgroup_page_lruvec.patch