---

yaml --- r: 24214 b: refs/heads/master c: 5bcb28b h: refs/heads/master v: v3
git-mirror · Mar 26, 2006 · cb58c0e · cb58c0e
1 parent e74969c
commit cb58c0e
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: 910dea7fdda22f0ee83d26d459e460c79ed94557
+refs/heads/master: 5bcb28b139cffc736177ceb775d1c8b5c5a411e2
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -2352,10 +2352,8 @@ int make_pages_present(unsigned long addr, unsigned long end)
 	if (!vma)
 		return -1;
 	write = (vma->vm_flags & VM_WRITE) != 0;
-	if (addr >= end)
-		BUG();
-	if (end > vma->vm_end)
-		BUG();
+	BUG_ON(addr >= end);
+	BUG_ON(end > vma->vm_end);
 	len = (end+PAGE_SIZE-1)/PAGE_SIZE-addr/PAGE_SIZE;
 	ret = get_user_pages(current, current->mm, addr,
 			len, write, 0, NULL, NULL);