OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm-vmalloc.patch 

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-07-12 11:39:36 +02:00 committed by Alibek Omarov
parent 7643ead733
commit cc5d4c7047
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mm/vmalloc.c
View File

@ -796,7 +796,7 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
struct vmap_block *vb;
struct vmap_area *va;
unsigned long vb_idx;
int node, err;
int node, err, cpu;
node = numa_node_id();
@ -834,11 +834,12 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
BUG_ON(err);
radix_tree_preload_end();
vbq = &get_cpu_var(vmap_block_queue);
cpu = get_cpu_light();
vbq = &__get_cpu_var(vmap_block_queue);
spin_lock(&vbq->lock);
list_add_rcu(&vb->free_list, &vbq->free);
spin_unlock(&vbq->lock);
put_cpu_var(vmap_block_queue);
put_cpu_light();
return vb;
}
@ -906,6 +907,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
struct vmap_block *vb;
unsigned long addr = 0;
unsigned int order;
int cpu = 0;
BUG_ON(size & ~PAGE_MASK);
BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
@ -921,7 +923,8 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
again:
rcu_read_lock();
vbq = &get_cpu_var(vmap_block_queue);
cpu = get_cpu_light();
vbq = &__get_cpu_var(vmap_block_queue);
list_for_each_entry_rcu(vb, &vbq->free, free_list) {
int i;
@ -945,7 +948,7 @@ next:
spin_unlock(&vb->lock);
}
put_cpu_var(vmap_block_queue);
put_cpu_light();
rcu_read_unlock();
if (!addr) {