From: Xiongwei Song <xiongwei.song@xxxxxxxxxxxxx>
We are going to move slab merge from slab_common.c to slub.c, there is a
call with it in find_mergeable(), so make it public.
Signed-off-by: Xiongwei Song <xiongwei.song@xxxxxxxxxxxxx>
---
mm/slab.h | 2 ++
mm/slab_common.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/mm/slab.h b/mm/slab.h
index eb04c8a5dbd1..8d20f8c6269d 100644
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -427,6 +427,8 @@ extern void create_boot_cache(struct kmem_cache *, const char *name,
unsigned int size, slab_flags_t flags,
unsigned int useroffset, unsigned int usersize);
+unsigned int calculate_alignment(slab_flags_t flags,
+ unsigned int align, unsigned int size);
int slab_unmergeable(struct kmem_cache *s);
struct kmem_cache *find_mergeable(unsigned size, unsigned align,
slab_flags_t flags, const char *name, void (*ctor)(void *));
diff --git a/mm/slab_common.c b/mm/slab_common.c
index d707abd31926..62eb77fdedf2 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -106,7 +106,7 @@ static inline int kmem_cache_sanity_check(const char *name, unsigned int size)
* Figure out what the alignment of the objects will be given a set of
* flags, a user specified alignment and the size of the objects.
*/
-static unsigned int calculate_alignment(slab_flags_t flags,
+unsigned int calculate_alignment(slab_flags_t flags,
unsigned int align, unsigned int size)
{
/*
--
2.34.1
