aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/slab.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2006-09-25 23:31:36 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 08:48:49 -0700
commitdbe5e69d2d6e591996ea2b817b887d03b60bb143 (patch)
tree09e21f2e0da60faef982d02a9224e62c409e776a /include/linux/slab.h
parentda6052f7b33abe55fbfd7d2213815f58c00a88d4 (diff)
downloadkernel_samsung_smdk4412-dbe5e69d2d6e591996ea2b817b887d03b60bb143.zip
kernel_samsung_smdk4412-dbe5e69d2d6e591996ea2b817b887d03b60bb143.tar.gz
kernel_samsung_smdk4412-dbe5e69d2d6e591996ea2b817b887d03b60bb143.tar.bz2
[PATCH] slab: optimize kmalloc_node the same way as kmalloc
[akpm@osdl.org: export fix] Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/slab.h')
-rw-r--r--include/linux/slab.h25
1 files changed, 24 insertions, 1 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 193c03c..2f6bef6 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -202,7 +202,30 @@ extern int slab_is_available(void);
#ifdef CONFIG_NUMA
extern void *kmem_cache_alloc_node(kmem_cache_t *, gfp_t flags, int node);
-extern void *kmalloc_node(size_t size, gfp_t flags, int node);
+extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
+
+static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+{
+ if (__builtin_constant_p(size)) {
+ int i = 0;
+#define CACHE(x) \
+ if (size <= x) \
+ goto found; \
+ else \
+ i++;
+#include "kmalloc_sizes.h"
+#undef CACHE
+ {
+ extern void __you_cannot_kmalloc_that_much(void);
+ __you_cannot_kmalloc_that_much();
+ }
+found:
+ return kmem_cache_alloc_node((flags & GFP_DMA) ?
+ malloc_sizes[i].cs_dmacachep :
+ malloc_sizes[i].cs_cachep, flags, node);
+ }
+ return __kmalloc_node(size, flags, node);
+}
#else
static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, gfp_t flags, int node)
{