From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Sun, 26 Mar 2006 16:30:52 +0000 (+0200)
Subject: BUG_ON() Conversion in mm/memory.c
X-Git-Tag: v3.12-rc1~37301^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bcb28b139cffc736177ceb775d1c8b5c5a411e2;p=kernel%2Fkernel-generic.git

BUG_ON() Conversion in mm/memory.c

this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---

diff --git a/mm/memory.c b/mm/memory.c
index e347e10..d90ff9d 100644
--- a/mm/memory.c
+++ b/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);