Subject: mm/vmalloc: Another preempt disable region which sucks From: Thomas Gleixner Date: Tue Jul 12 11:39:36 2011 +0200 From: Thomas Gleixner Avoid the preempt disable version of get_cpu_var(). The inner-lock should provide enough serialisation. Signed-off-by: Thomas Gleixner --- mm/vmalloc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1918,11 +1918,12 @@ static void *new_vmap_block(unsigned int return ERR_PTR(err); } - vbq = &get_cpu_var(vmap_block_queue); + get_cpu_light(); + vbq = this_cpu_ptr(&vmap_block_queue); spin_lock(&vbq->lock); list_add_tail_rcu(&vb->free_list, &vbq->free); spin_unlock(&vbq->lock); - put_cpu_var(vmap_block_queue); + put_cpu_light(); return vaddr; } @@ -2001,7 +2002,8 @@ static void *vb_alloc(unsigned long size order = get_order(size); rcu_read_lock(); - vbq = &get_cpu_var(vmap_block_queue); + get_cpu_light(); + vbq = this_cpu_ptr(&vmap_block_queue); list_for_each_entry_rcu(vb, &vbq->free, free_list) { unsigned long pages_off; @@ -2024,7 +2026,7 @@ static void *vb_alloc(unsigned long size break; } - put_cpu_var(vmap_block_queue); + put_cpu_light(); rcu_read_unlock(); /* Allocate new block if nothing was found */