aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2010-08-25 15:51:14 -0400
committerPekka Enberg <penberg@kernel.org>2010-10-02 03:24:28 -0400
commit8de66a0c022c7c575c7481224803292cdabed4c4 (patch)
tree89907eda191909c84f8a9495daaf26a9b86c2bd2 /mm
parent7d550c56a24b20e91ec469054230bd2e2485996a (diff)
slub: Fix up missing kmalloc_cache -> kmem_cache_node case for memoryhotplug
Memory hotplug allocates and frees per node structures. Use the correct name. Acked-by: David Rientjes <rientjes@google.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c
index c1add106c431..b244a5a11a98 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2909,7 +2909,7 @@ static void slab_mem_offline_callback(void *arg)
2909 BUG_ON(slabs_node(s, offline_node)); 2909 BUG_ON(slabs_node(s, offline_node));
2910 2910
2911 s->node[offline_node] = NULL; 2911 s->node[offline_node] = NULL;
2912 kmem_cache_free(kmalloc_caches, n); 2912 kmem_cache_free(kmem_cache_node, n);
2913 } 2913 }
2914 } 2914 }
2915 up_read(&slub_lock); 2915 up_read(&slub_lock);
@@ -2942,7 +2942,7 @@ static int slab_mem_going_online_callback(void *arg)
2942 * since memory is not yet available from the node that 2942 * since memory is not yet available from the node that
2943 * is brought up. 2943 * is brought up.
2944 */ 2944 */
2945 n = kmem_cache_alloc(kmalloc_caches, GFP_KERNEL); 2945 n = kmem_cache_alloc(kmem_cache_node, GFP_KERNEL);
2946 if (!n) { 2946 if (!n) {
2947 ret = -ENOMEM; 2947 ret = -ENOMEM;
2948 goto out; 2948 goto out;