diff options
| author | Tejun Heo <tj@kernel.org> | 2009-10-29 09:34:12 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-10-29 09:34:12 -0400 |
| commit | 3f04ba859597412afbfb31f2fcbe289f2461f9a1 (patch) | |
| tree | 63ee0a7423f94a109e630de7aca06b32c075acd0 | |
| parent | dec54bf538326a1503dd780c9f2811f495af95c5 (diff) | |
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.c | 4 |
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) | |||
| 760 | spin_lock(&vbq->lock); | 760 | spin_lock(&vbq->lock); |
| 761 | list_add(&vb->free_list, &vbq->free); | 761 | list_add(&vb->free_list, &vbq->free); |
| 762 | spin_unlock(&vbq->lock); | 762 | spin_unlock(&vbq->lock); |
| 763 | put_cpu_var(vmap_cpu_blocks); | 763 | put_cpu_var(vmap_block_queue); |
| 764 | 764 | ||
| 765 | return vb; | 765 | return vb; |
| 766 | } | 766 | } |
| @@ -825,7 +825,7 @@ again: | |||
| 825 | } | 825 | } |
| 826 | spin_unlock(&vb->lock); | 826 | spin_unlock(&vb->lock); |
| 827 | } | 827 | } |
| 828 | put_cpu_var(vmap_cpu_blocks); | 828 | put_cpu_var(vmap_block_queue); |
| 829 | rcu_read_unlock(); | 829 | rcu_read_unlock(); |
| 830 | 830 | ||
| 831 | if (!addr) { | 831 | if (!addr) { |
