Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4097d601 authored by Christoph Lameter's avatar Christoph Lameter Committed by Pekka Enberg
Browse files

slub: Reduce #ifdef ZONE_DMA by moving kmalloc_caches_dma near dma logic 



Move the definition of kmalloc_caches_dma() into a later #ifdef CONFIG_ZONE_DMA.
This saves one #ifdef and leaves us with a total of two #ifdefs for dma slab support.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent 62f75532

mm/slub.c

+1 −4
Original line number Diff line number Diff line
@@ -2412,10 +2412,6 @@ EXPORT_SYMBOL(kmem_cache_destroy); 
struct kmem_cache kmalloc_caches[PAGE_SHIFT + 1] __cacheline_aligned;

EXPORT_SYMBOL(kmalloc_caches);



#ifdef CONFIG_ZONE_DMA

static struct kmem_cache *kmalloc_caches_dma[PAGE_SHIFT + 1];

#endif



static int __init setup_slub_min_order(char *str)

{

	get_option(&str, &slub_min_order);
@@ -2475,6 +2471,7 @@ static struct kmem_cache *create_kmalloc_cache(struct kmem_cache *s, 
}



#ifdef CONFIG_ZONE_DMA

static struct kmem_cache *kmalloc_caches_dma[PAGE_SHIFT + 1];



static void sysfs_add_func(struct work_struct *w)

{