mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
SL*B: drop kmem cache argument from constructor
Kmem cache passed to constructor is only needed for constructors that are themselves multiplexeres. Nobody uses this "feature", nor does anybody uses passed kmem cache in non-trivial way, so pass only pointer to object. Non-trivial places are: arch/powerpc/mm/init_64.c arch/powerpc/mm/hugetlbpage.c This is flag day, yes. Signed-off-by: Alexey Dobriyan <[email protected]> Acked-by: Pekka Enberg <[email protected]> Acked-by: Christoph Lameter <[email protected]> Cc: Jon Tollefson <[email protected]> Cc: Nick Piggin <[email protected]> Cc: Matt Mackall <[email protected]> [[email protected]: fix arch/powerpc/mm/hugetlbpage.c] [[email protected]: fix mm/slab.c] [[email protected]: fix ubifs] Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
d91958815d
commit
51cc50685a
67 changed files with 90 additions and 106 deletions
13
mm/slub.c
13
mm/slub.c
|
|
@ -1012,7 +1012,7 @@ __setup("slub_debug", setup_slub_debug);
|
|||
|
||||
static unsigned long kmem_cache_flags(unsigned long objsize,
|
||||
unsigned long flags, const char *name,
|
||||
void (*ctor)(struct kmem_cache *, void *))
|
||||
void (*ctor)(void *))
|
||||
{
|
||||
/*
|
||||
* Enable debugging if selected on the kernel commandline.
|
||||
|
|
@ -1040,7 +1040,7 @@ static inline int check_object(struct kmem_cache *s, struct page *page,
|
|||
static inline void add_full(struct kmem_cache_node *n, struct page *page) {}
|
||||
static inline unsigned long kmem_cache_flags(unsigned long objsize,
|
||||
unsigned long flags, const char *name,
|
||||
void (*ctor)(struct kmem_cache *, void *))
|
||||
void (*ctor)(void *))
|
||||
{
|
||||
return flags;
|
||||
}
|
||||
|
|
@ -1103,7 +1103,7 @@ static void setup_object(struct kmem_cache *s, struct page *page,
|
|||
{
|
||||
setup_object_debug(s, page, object);
|
||||
if (unlikely(s->ctor))
|
||||
s->ctor(s, object);
|
||||
s->ctor(object);
|
||||
}
|
||||
|
||||
static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node)
|
||||
|
|
@ -2286,7 +2286,7 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
|
|||
static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags,
|
||||
const char *name, size_t size,
|
||||
size_t align, unsigned long flags,
|
||||
void (*ctor)(struct kmem_cache *, void *))
|
||||
void (*ctor)(void *))
|
||||
{
|
||||
memset(s, 0, kmem_size);
|
||||
s->name = name;
|
||||
|
|
@ -3042,7 +3042,7 @@ static int slab_unmergeable(struct kmem_cache *s)
|
|||
|
||||
static struct kmem_cache *find_mergeable(size_t size,
|
||||
size_t align, unsigned long flags, const char *name,
|
||||
void (*ctor)(struct kmem_cache *, void *))
|
||||
void (*ctor)(void *))
|
||||
{
|
||||
struct kmem_cache *s;
|
||||
|
||||
|
|
@ -3082,8 +3082,7 @@ static struct kmem_cache *find_mergeable(size_t size,
|
|||
}
|
||||
|
||||
struct kmem_cache *kmem_cache_create(const char *name, size_t size,
|
||||
size_t align, unsigned long flags,
|
||||
void (*ctor)(struct kmem_cache *, void *))
|
||||
size_t align, unsigned long flags, void (*ctor)(void *))
|
||||
{
|
||||
struct kmem_cache *s;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue