Merge tag 'nfs-for-5.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[mirror_ubuntu-hirsute-kernel.git] / mm / list_lru.c

diff --git a/mm/list_lru.c b/mm/list_lru.c
index 0f1f6b06b7f365ee65643007ec686a783c5148b6..8de5e3784ee4699e35007504d5f94ee91a75f2fc 100644 (file)
--- a/mm/list_lru.c
+++ b/mm/list_lru.c
@@ -57,16 +57,6 @@ list_lru_from_memcg_idx(struct list_lru_node *nlru, int idx)
        return &nlru->lru;
 }
 
-static __always_inline struct mem_cgroup *mem_cgroup_from_kmem(void *ptr)
-{
-       struct page *page;
-
-       if (!memcg_kmem_enabled())
-               return NULL;
-       page = virt_to_head_page(ptr);
-       return memcg_from_slab_page(page);
-}
-
 static inline struct list_lru_one *
 list_lru_from_kmem(struct list_lru_node *nlru, void *ptr,
                   struct mem_cgroup **memcg_ptr)
@@ -77,7 +67,7 @@ list_lru_from_kmem(struct list_lru_node *nlru, void *ptr,
        if (!nlru->memcg_lrus)
                goto out;
 
-       memcg = mem_cgroup_from_kmem(ptr);
+       memcg = mem_cgroup_from_obj(ptr);
        if (!memcg)
                goto out;