X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=mm%2Fvmalloc.c;h=55c7a47391f600c5b89a0522ae9413e448e12708;hb=170168d0a351c045adc0bee0987e51dfc82890c0;hp=9f909622a25eb9f5ac3f5489465d18c02d961c24;hpb=e574b5fd20027b422aa80790f710d695699b4fba;p=net-next-2.6.git

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 9f909622a25..55c7a47391f 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -293,13 +293,13 @@ static void __insert_vmap_area(struct vmap_area *va)
 	struct rb_node *tmp;
 
 	while (*p) {
-		struct vmap_area *tmp;
+		struct vmap_area *tmp_va;
 
 		parent = *p;
-		tmp = rb_entry(parent, struct vmap_area, rb_node);
-		if (va->va_start < tmp->va_end)
+		tmp_va = rb_entry(parent, struct vmap_area, rb_node);
+		if (va->va_start < tmp_va->va_end)
 			p = &(*p)->rb_left;
-		else if (va->va_end > tmp->va_start)
+		else if (va->va_end > tmp_va->va_start)
 			p = &(*p)->rb_right;
 		else
 			BUG();