aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slab.h
diff options
context:
space:
mode:
Diffstat (limited to 'mm/slab.h')
-rw-r--r--mm/slab.h21
1 files changed, 4 insertions, 17 deletions
diff --git a/mm/slab.h b/mm/slab.h
index 8184a7cde272..3045316b7c9d 100644
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -55,12 +55,12 @@ extern void create_boot_cache(struct kmem_cache *, const char *name,
55struct mem_cgroup; 55struct mem_cgroup;
56#ifdef CONFIG_SLUB 56#ifdef CONFIG_SLUB
57struct kmem_cache * 57struct kmem_cache *
58__kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size, 58__kmem_cache_alias(const char *name, size_t size, size_t align,
59 size_t align, unsigned long flags, void (*ctor)(void *)); 59 unsigned long flags, void (*ctor)(void *));
60#else 60#else
61static inline struct kmem_cache * 61static inline struct kmem_cache *
62__kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size, 62__kmem_cache_alias(const char *name, size_t size, size_t align,
63 size_t align, unsigned long flags, void (*ctor)(void *)) 63 unsigned long flags, void (*ctor)(void *))
64{ return NULL; } 64{ return NULL; }
65#endif 65#endif
66 66
@@ -119,13 +119,6 @@ static inline bool is_root_cache(struct kmem_cache *s)
119 return !s->memcg_params || s->memcg_params->is_root_cache; 119 return !s->memcg_params || s->memcg_params->is_root_cache;
120} 120}
121 121
122static inline bool cache_match_memcg(struct kmem_cache *cachep,
123 struct mem_cgroup *memcg)
124{
125 return (is_root_cache(cachep) && !memcg) ||
126 (cachep->memcg_params->memcg == memcg);
127}
128
129static inline void memcg_bind_pages(struct kmem_cache *s, int order) 122static inline void memcg_bind_pages(struct kmem_cache *s, int order)
130{ 123{
131 if (!is_root_cache(s)) 124 if (!is_root_cache(s))
@@ -204,12 +197,6 @@ static inline bool is_root_cache(struct kmem_cache *s)
204 return true; 197 return true;
205} 198}
206 199
207static inline bool cache_match_memcg(struct kmem_cache *cachep,
208 struct mem_cgroup *memcg)
209{
210 return true;
211}
212
213static inline void memcg_bind_pages(struct kmem_cache *s, int order) 200static inline void memcg_bind_pages(struct kmem_cache *s, int order)
214{ 201{
215} 202}