diff options
Diffstat (limited to 'mm/slab.h')
-rw-r--r-- | mm/slab.h | 21 |
1 files changed, 4 insertions, 17 deletions
@@ -55,12 +55,12 @@ extern void create_boot_cache(struct kmem_cache *, const char *name, | |||
55 | struct mem_cgroup; | 55 | struct mem_cgroup; |
56 | #ifdef CONFIG_SLUB | 56 | #ifdef CONFIG_SLUB |
57 | struct kmem_cache * | 57 | struct 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 |
61 | static inline struct kmem_cache * | 61 | static 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 | ||
122 | static 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 | |||
129 | static inline void memcg_bind_pages(struct kmem_cache *s, int order) | 122 | static 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 | ||
207 | static inline bool cache_match_memcg(struct kmem_cache *cachep, | ||
208 | struct mem_cgroup *memcg) | ||
209 | { | ||
210 | return true; | ||
211 | } | ||
212 | |||
213 | static inline void memcg_bind_pages(struct kmem_cache *s, int order) | 200 | static inline void memcg_bind_pages(struct kmem_cache *s, int order) |
214 | { | 201 | { |
215 | } | 202 | } |