lkml.org 
[lkml]   [2012]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/10] mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype
    Date
    This long (seemingly unnecessary) patch does not fix anything and
    its only goal is to produce common code between SLAB and SLUB.

    Cc: Pekka Enberg <penberg@kernel.org>
    Cc: Christoph Lameter <cl@linux.com>
    Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
    ---
    include/linux/slab_def.h | 7 +++----
    mm/slab.c | 10 +++++-----
    2 files changed, 8 insertions(+), 9 deletions(-)

    diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
    index 604ebc8..e98caeb 100644
    --- a/include/linux/slab_def.h
    +++ b/include/linux/slab_def.h
    @@ -111,11 +111,10 @@ void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
    void *__kmalloc(size_t size, gfp_t flags);

    #ifdef CONFIG_TRACING
    -extern void *kmem_cache_alloc_trace(size_t size,
    - struct kmem_cache *cachep, gfp_t flags);
    +extern void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t);
    #else
    static __always_inline void *
    -kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags)
    +kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
    {
    return kmem_cache_alloc(cachep, flags);
    }
    @@ -148,7 +147,7 @@ found:
    #endif
    cachep = malloc_sizes[i].cs_cachep;

    - ret = kmem_cache_alloc_trace(size, cachep, flags);
    + ret = kmem_cache_alloc_trace(cachep, flags, size);

    return ret;
    }
    diff --git a/mm/slab.c b/mm/slab.c
    index bc342d1..47cb03c 100644
    --- a/mm/slab.c
    +++ b/mm/slab.c
    @@ -3834,7 +3834,7 @@ EXPORT_SYMBOL(kmem_cache_alloc);

    #ifdef CONFIG_TRACING
    void *
    -kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags)
    +kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
    {
    void *ret;

    @@ -3861,10 +3861,10 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid)
    EXPORT_SYMBOL(kmem_cache_alloc_node);

    #ifdef CONFIG_TRACING
    -void *kmem_cache_alloc_node_trace(size_t size,
    - struct kmem_cache *cachep,
    +void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
    gfp_t flags,
    - int nodeid)
    + int nodeid,
    + size_t size)
    {
    void *ret;

    @@ -3886,7 +3886,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
    cachep = kmem_find_general_cachep(size, flags);
    if (unlikely(ZERO_OR_NULL_PTR(cachep)))
    return cachep;
    - return kmem_cache_alloc_node_trace(size, cachep, flags, node);
    + return kmem_cache_alloc_node_trace(cachep, flags, node, size);
    }

    #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)
    --
    1.7.8.6


    \
     
     \ /
      Last update: 2012-09-08 23:21    [W:0.024 / U:30.576 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site