diff --git a/[refs] b/[refs] index 029b0d781dcb..68eb15e2171a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62f75532b583c03840f31e40386ce2df73be9ca0 +refs/heads/master: 4097d6017576a5e138f442f5e3c393ad00d10f58 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 15a7a0d45d71..3df6d5bdd711 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -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) {