---

yaml --- r: 217483 b: refs/heads/master c: 170168d h: refs/heads/master i: 217481: 868596d 217479: 0a9e11e v: v3
git-mirror · Oct 26, 2010 · 50c8cb0 · 50c8cb0
1 parent b8b6339
commit 50c8cb0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e574b5fd20027b422aa80790f710d695699b4fba
+refs/heads/master: 170168d0a351c045adc0bee0987e51dfc82890c0
diff --git a/trunk/mm/vmalloc.c b/trunk/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();