summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-10-29 14:34:12 +0100
committerTejun Heo <tj@kernel.org>2009-10-29 14:34:12 +0100
commit3f04ba859597412afbfb31f2fcbe289f2461f9a1 (patch)
tree63ee0a7423f94a109e630de7aca06b32c075acd0
parentthis_cpu: Use this_cpu_xx in trace_functions_graph.c (diff)
downloadlinux-3f04ba859597412afbfb31f2fcbe289f2461f9a1.tar.xz
linux-3f04ba859597412afbfb31f2fcbe289f2461f9a1.zip
vmalloc: fix use of non-existent percpu variable in put_cpu_var()
vmalloc used non-existent percpu variable vmap_cpu_blocks instead of the intended vmap_block_queue. This went unnoticed because put_cpu_var() didn't evaluate the parameter. Fix it. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Nick Piggin <npiggin@suse.de>
-rw-r--r--mm/vmalloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 69511e663234..b65cfe44a562 100644
--- a/mm/vmalloc.c
+++ b/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 @@ again:
}
spin_unlock(&vb->lock);
}
- put_cpu_var(vmap_cpu_blocks);
+ put_cpu_var(vmap_block_queue);
rcu_read_unlock();
if (!addr) {