From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx103.postini.com [74.125.245.103]) by kanga.kvack.org (Postfix) with SMTP id 962E76B00A0 for ; Fri, 19 Oct 2012 10:32:23 -0400 (EDT) Message-Id: <0000013a79706a9e-d1fe2ad5-3103-4deb-97fb-2d7a9eb7af71-000000@email.amazonses.com> Date: Fri, 19 Oct 2012 14:32:22 +0000 From: Christoph Lameter Subject: CK2 [12/15] Common definition for the array of kmalloc caches References: <20121019142254.724806786@linux.com> Sender: owner-linux-mm@kvack.org List-ID: To: Pekka Enberg Cc: Joonsoo Kim , Glauber Costa , linux-mm@kvack.org, David Rientjes , elezegarcia@gmail.com Have a common definition fo the kmalloc cache arrays in SLAB and SLUB Signed-off-by: Christoph Lameter Index: linux/mm/slab_common.c =================================================================== --- linux.orig/mm/slab_common.c 2012-10-19 09:12:51.826535800 -0500 +++ linux/mm/slab_common.c 2012-10-19 09:15:41.917443602 -0500 @@ -254,5 +254,13 @@ struct kmem_cache *__init create_kmalloc return s; } +struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; +EXPORT_SYMBOL(kmalloc_caches); + +#ifdef CONFIG_ZONE_DMA +struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; +EXPORT_SYMBOL(kmalloc_dma_caches); +#endif + #endif /* !CONFIG_SLOB */ Index: linux/include/linux/slub_def.h =================================================================== --- linux.orig/include/linux/slub_def.h 2012-10-19 09:15:19.813065713 -0500 +++ linux/include/linux/slub_def.h 2012-10-19 09:15:41.917443602 -0500 @@ -119,12 +119,6 @@ struct kmem_cache { #endif /* - * We keep the general caches in an array of slab caches that are used for - * 2^x bytes of allocations. - */ -extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; - -/* * Find the slab cache for a given combination of allocation flags and size. * * This ought to end up with a global pointer to the right cache Index: linux/mm/slub.c =================================================================== --- linux.orig/mm/slub.c 2012-10-19 09:15:19.817065783 -0500 +++ linux/mm/slub.c 2012-10-19 09:15:41.921443708 -0500 @@ -3176,13 +3176,6 @@ int __kmem_cache_shutdown(struct kmem_ca * Kmalloc subsystem *******************************************************************/ -struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; -EXPORT_SYMBOL(kmalloc_caches); - -#ifdef CONFIG_ZONE_DMA -static struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; -#endif - static int __init setup_slub_min_order(char *str) { get_option(&str, &slub_min_order); Index: linux/include/linux/slab.h =================================================================== --- linux.orig/include/linux/slab.h 2012-10-19 09:15:19.813065713 -0500 +++ linux/include/linux/slab.h 2012-10-19 09:15:41.921443708 -0500 @@ -200,6 +200,11 @@ struct kmem_cache { #define KMALLOC_MIN_SIZE (1 << KMALLOC_SHIFT_LOW) #endif +extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; +#ifdef CONFIG_ZONE_DMA +extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; +#endif + /* * Figure out which kmalloc slab an allocation of a certain size * belongs to. Index: linux/mm/slab.c =================================================================== --- linux.orig/mm/slab.c 2012-10-19 09:14:55.192644806 -0500 +++ linux/mm/slab.c 2012-10-19 09:15:41.921443708 -0500 @@ -334,14 +334,6 @@ static void free_block(struct kmem_cache static int enable_cpucache(struct kmem_cache *cachep, gfp_t gfp); static void cache_reap(struct work_struct *unused); -struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; -EXPORT_SYMBOL(kmalloc_caches); - -#ifdef CONFIG_ZONE_DMA -struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; -EXPORT_SYMBOL(kmalloc_dma_caches); -#endif - static int slab_early_init = 1; #define INDEX_AC kmalloc_index(sizeof(struct arraycache_init)) Index: linux/include/linux/slab_def.h =================================================================== --- linux.orig/include/linux/slab_def.h 2012-10-19 09:14:55.188644735 -0500 +++ linux/include/linux/slab_def.h 2012-10-19 09:15:41.921443708 -0500 @@ -95,9 +95,6 @@ struct kmem_cache { */ }; -extern struct kmem_cache *kmalloc_caches[PAGE_SHIFT + MAX_ORDER]; -extern struct kmem_cache *kmalloc_dma_caches[PAGE_SHIFT + MAX_ORDER]; - void *kmem_cache_alloc(struct kmem_cache *, gfp_t); void *__kmalloc(size_t size, gfp_t flags); -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org