From: Christoph Lameter Date: Sat, 1 Mar 2008 21:56:40 +0000 (-0800) Subject: slub: Add kmalloc_large_node() to support kmalloc_node fallback X-Git-Tag: v2.6.25-rc4~107^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f619cfe1bda809a97c407f4c723eb3235ecd64e5;p=linux-2.6-omap-h63xx.git slub: Add kmalloc_large_node() to support kmalloc_node fallback Slub is missing some NUMA support for large kmallocs. Provide that. Reviewed-by: Pekka Enberg Signed-off-by: Christoph Lameter --- diff --git a/mm/slub.c b/mm/slub.c index db8026ba049..ecacacdce9d 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2592,13 +2592,24 @@ void *__kmalloc(size_t size, gfp_t flags) } EXPORT_SYMBOL(__kmalloc); +static void *kmalloc_large_node(size_t size, gfp_t flags, int node) +{ + struct page *page = alloc_pages_node(node, flags | __GFP_COMP, + get_order(size)); + + if (page) + return page_address(page); + else + return NULL; +} + #ifdef CONFIG_NUMA void *__kmalloc_node(size_t size, gfp_t flags, int node) { struct kmem_cache *s; if (unlikely(size > PAGE_SIZE)) - return kmalloc_large(size, flags); + return kmalloc_large_node(size, flags, node); s = get_slab(size, flags); @@ -3146,7 +3157,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, struct kmem_cache *s; if (unlikely(size > PAGE_SIZE)) - return kmalloc_large(size, gfpflags); + return kmalloc_large_node(size, gfpflags, node); s = get_slab(size, gfpflags);