diff --git a/[refs] b/[refs] index a561196bdbf1..c182141f7d91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dec54bf538326a1503dd780c9f2811f495af95c5 +refs/heads/master: 3f04ba859597412afbfb31f2fcbe289f2461f9a1 diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 69511e663234..b65cfe44a562 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -760,7 +760,7 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask) spin_lock(&vbq->lock); list_add(&vb->free_list, &vbq->free); spin_unlock(&vbq->lock); - put_cpu_var(vmap_cpu_blocks); + put_cpu_var(vmap_block_queue); return vb; } @@ -825,7 +825,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask) } spin_unlock(&vb->lock); } - put_cpu_var(vmap_cpu_blocks); + put_cpu_var(vmap_block_queue); rcu_read_unlock(); if (!addr) {