diff options
author | Christoph Lameter <clameter@sgi.com> | 2008-04-14 11:51:18 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-04-14 11:51:18 -0400 |
commit | 4097d6017576a5e138f442f5e3c393ad00d10f58 (patch) | |
tree | 1c9f90fa4ec806ff0d91f25883158b86e46b62ec | |
parent | 62f75532b583c03840f31e40386ce2df73be9ca0 (diff) |
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: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
-rw-r--r-- | mm/slub.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -2412,10 +2412,6 @@ EXPORT_SYMBOL(kmem_cache_destroy); | |||
2412 | struct kmem_cache kmalloc_caches[PAGE_SHIFT + 1] __cacheline_aligned; | 2412 | struct kmem_cache kmalloc_caches[PAGE_SHIFT + 1] __cacheline_aligned; |
2413 | EXPORT_SYMBOL(kmalloc_caches); | 2413 | EXPORT_SYMBOL(kmalloc_caches); |
2414 | 2414 | ||
2415 | #ifdef CONFIG_ZONE_DMA | ||
2416 | static struct kmem_cache *kmalloc_caches_dma[PAGE_SHIFT + 1]; | ||
2417 | #endif | ||
2418 | |||
2419 | static int __init setup_slub_min_order(char *str) | 2415 | static int __init setup_slub_min_order(char *str) |
2420 | { | 2416 | { |
2421 | get_option(&str, &slub_min_order); | 2417 | get_option(&str, &slub_min_order); |
@@ -2475,6 +2471,7 @@ panic: | |||
2475 | } | 2471 | } |
2476 | 2472 | ||
2477 | #ifdef CONFIG_ZONE_DMA | 2473 | #ifdef CONFIG_ZONE_DMA |
2474 | static struct kmem_cache *kmalloc_caches_dma[PAGE_SHIFT + 1]; | ||
2478 | 2475 | ||
2479 | static void sysfs_add_func(struct work_struct *w) | 2476 | static void sysfs_add_func(struct work_struct *w) |
2480 | { | 2477 | { |