From 50c8cb0896ace14dc784cc7a8ab22aea1e54ad2e Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Tue, 26 Oct 2010 14:22:02 -0700
Subject: [PATCH] --- yaml --- r: 217483 b: refs/heads/master c:
 170168d0a351c045adc0bee0987e51dfc82890c0 h: refs/heads/master i:   217481:
 868596d57864b193d1e2e2fd927ce80d0e4dbc5a   217479:
 0a9e11e6fd935b2b0d15fa5bbcd1afbafb82e5da v: v3

---
 [refs]             | 2 +-
 trunk/mm/vmalloc.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 43d1c9c00944..65a8d35267e2 100644
--- 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
index 9f909622a25e..55c7a47391f6 100644
--- 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();