---

yaml --- r: 250867 b: refs/heads/master c: d75a310 h: refs/heads/master i: 250865: 9c16435 250863: 42ff1ce v: v3
git-mirror · May 25, 2011 · 8c2e73b · 8c2e73b
1 parent e841109
commit 8c2e73b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e922c4c5360980bfeb862b3ec307d36bb344dcae
+refs/heads/master: d75a310c42c616c168953ed45c1091074f97828c
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
@@ -1635,7 +1635,6 @@ static int shrink_vma(struct mm_struct *mm,
 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
 {
 	struct vm_area_struct *vma;
-	struct rb_node *rb;
 	unsigned long end = start + len;
 	int ret;
 
@@ -1668,9 +1667,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
 			}
 			if (end == vma->vm_end)
 				goto erase_whole_vma;
-			rb = rb_next(&vma->vm_rb);
-			vma = rb_entry(rb, struct vm_area_struct, vm_rb);
-		} while (rb);
+			vma = vma->vm_next;
+		} while (vma);
 		kleave(" = -EINVAL [split file]");
 		return -EINVAL;
 	} else {