From 4e4bd42d3f54875a81b4513fe58df55f0ddf0f9f Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 29 Oct 2009 22:34:12 +0900 Subject: [PATCH] --- yaml --- r: 175903 b: refs/heads/master c: 3f04ba859597412afbfb31f2fcbe289f2461f9a1 h: refs/heads/master i: 175901: b6828b85d1e0dc74edf7c40a6235d599b2bfd170 175899: c93433068897c522bfc577b03b03c084bc9b7fcc 175895: 76440fbc7e0d18b03a5babed39cfe9dfb3947fbd 175887: 3ba6903b56009b6f4cd0c3fd914a57179ebe5591 175871: 7fa74d91649d08e5b040f5843da2c94137939c55 v: v3 --- [refs] | 2 +- trunk/mm/vmalloc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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) {