Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung...

[firefly-linux-kernel-4.4.55.git] / include / linux / slab_def.h

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 0c634fa376c94b213bc295fb6372d60448623d83..cc290f0bdb346efe82dbe0e87985e6d015ad58e1 100644 (file)
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -45,7 +45,6 @@ struct kmem_cache {
        unsigned int colour_off;        /* colour offset */
        struct kmem_cache *slabp_cache;
        unsigned int slab_size;
-       unsigned int dflags;            /* dynamic flags */
 
        /* constructor func */
        void (*ctor)(void *obj);
@@ -112,19 +111,13 @@ 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 size_t slab_buffer_size(struct kmem_cache *cachep);
+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);
 }
-static inline size_t slab_buffer_size(struct kmem_cache *cachep)
-{
-       return 0;
-}
 #endif
 
 static __always_inline void *kmalloc(size_t size, gfp_t flags)
@@ -154,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;
        }
@@ -166,16 +159,16 @@ extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
 
 #ifdef CONFIG_TRACING
-extern void *kmem_cache_alloc_node_trace(size_t size,
-                                        struct kmem_cache *cachep,
+extern void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
                                         gfp_t flags,
-                                        int nodeid);
+                                        int nodeid,
+                                        size_t size);
 #else
 static __always_inline void *
-kmem_cache_alloc_node_trace(size_t size,
-                           struct kmem_cache *cachep,
+kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
                            gfp_t flags,
-                           int nodeid)
+                           int nodeid,
+                           size_t size)
 {
        return kmem_cache_alloc_node(cachep, flags, nodeid);
 }
@@ -207,7 +200,7 @@ found:
 #endif
                        cachep = malloc_sizes[i].cs_cachep;
 
-               return kmem_cache_alloc_node_trace(size, cachep, flags, node);
+               return kmem_cache_alloc_node_trace(cachep, flags, node, size);
        }
        return __kmalloc_node(size, flags, node);
 }