Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / mm / list_lru.c

diff --git a/mm/list_lru.c b/mm/list_lru.c
index 927d85be32f62deb58da1029603a01e3a04e61d9..0f1f6b06b7f365ee65643007ec686a783c5148b6 100644 (file)
--- a/mm/list_lru.c
+++ b/mm/list_lru.c
@@ -12,6 +12,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/memcontrol.h>
+#include "slab.h"
 
 #ifdef CONFIG_MEMCG_KMEM
 static LIST_HEAD(list_lrus);
@@ -63,7 +64,7 @@ static __always_inline struct mem_cgroup *mem_cgroup_from_kmem(void *ptr)
        if (!memcg_kmem_enabled())
                return NULL;
        page = virt_to_head_page(ptr);
-       return page->mem_cgroup;
+       return memcg_from_slab_page(page);
 }
 
 static inline struct list_lru_one *