slub: Determine gfpflags once and not every time a slab is allocated

[linux-2.6-omap-h63xx.git] / include / linux / slub_def.h

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 5e6d3d634d5b4a28ae4d3a22aee8a83eda8fac43..98be113cf935078cc0e84974a972aedfc0c2e025 100644 (file)
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -71,6 +71,7 @@ struct kmem_cache {
 
        /* Allocation and freeing of slabs */
        int objects;            /* Number of objects in slab */
+       gfp_t allocflags;       /* gfp flags to use on each alloc */
        int refcount;           /* Refcount for slab cache destroy */
        void (*ctor)(struct kmem_cache *, void *);
        int inuse;              /* Offset to metadata */
@@ -188,12 +189,16 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
 void *__kmalloc(size_t size, gfp_t flags);
 
+static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
+{
+       return (void *)__get_free_pages(flags | __GFP_COMP, get_order(size));
+}
+
 static __always_inline void *kmalloc(size_t size, gfp_t flags)
 {
        if (__builtin_constant_p(size)) {
                if (size > PAGE_SIZE / 2)
-                       return (void *)__get_free_pages(flags | __GFP_COMP,
-                                                       get_order(size));
+                       return kmalloc_large(size, flags);
 
                if (!(flags & SLUB_DMA)) {
                        struct kmem_cache *s = kmalloc_slab(size);