diff --git a/[refs] b/[refs] index b04d6ba3edaf..b64c87c1847f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5a84755c5900416dce0166ac825866aad8048ef +refs/heads/master: 92a5bbc11ff2442a54b2f1d313088c245828ef4e diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index fe536d3474d6..8fd5401bb071 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2851,7 +2851,7 @@ int kmem_cache_shrink(struct kmem_cache *s) } EXPORT_SYMBOL(kmem_cache_shrink); -#if defined(CONFIG_NUMA) && defined(CONFIG_MEMORY_HOTPLUG) +#if defined(CONFIG_MEMORY_HOTPLUG) static int slab_mem_going_offline_callback(void *arg) { struct kmem_cache *s;