diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-12-18 12:46:20 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-12-18 12:46:20 +0200 |
| commit | 08afe22c68d8c07e8e31ee6491c37f36199ba14b (patch) | |
| tree | 875d203149b74fddb50522fd5df3d6b154f5fe1e /include/linux/slab.h | |
| parent | a304f836a2e6d257c1f918b3431f97ef6b33e02e (diff) | |
| parent | 4590685546a374fb0f60682ce0e3a6fd48911d46 (diff) | |
Merge branch 'slab/next' into slab/for-linus
Fix up a trivial merge conflict with commit baaf1dd ("mm/slob: use
min_t() to compare ARCH_SLAB_MINALIGN") that did not go through the slab
tree.
Conflicts:
mm/slob.c
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'include/linux/slab.h')
| -rw-r--r-- | include/linux/slab.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index 83d1a1454b7..743a1041512 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -128,7 +128,6 @@ struct kmem_cache *kmem_cache_create(const char *, size_t, size_t, void kmem_cache_destroy(struct kmem_cache *); int kmem_cache_shrink(struct kmem_cache *); void kmem_cache_free(struct kmem_cache *, void *); -unsigned int kmem_cache_size(struct kmem_cache *); /* * Please use this macro to create slab caches. Simply specify the @@ -388,6 +387,14 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node) return kmalloc_node(size, flags | __GFP_ZERO, node); } +/* + * Determine the size of a slab object + */ +static inline unsigned int kmem_cache_size(struct kmem_cache *s) +{ + return s->object_size; +} + void __init kmem_cache_init_late(void); #endif /* _LINUX_SLAB_H */ |