From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Fri, 31 Mar 2006 23:26:09 +0000 (+0200)
Subject: BUG_ON() Conversion in mm/vmalloc.c
X-Git-Tag: v2.6.17-rc1~10^2~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5aae277ed67b0271235d3a50908bb48b0e59be26;p=linux-2.6-omap-h63xx.git

BUG_ON() Conversion in mm/vmalloc.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/vmalloc.c b/mm/vmalloc.c
index 729eb3eec75..c0504f1e34e 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -321,8 +321,7 @@ void __vunmap(void *addr, int deallocate_pages)
 		int i;
 
 		for (i = 0; i < area->nr_pages; i++) {
-			if (unlikely(!area->pages[i]))
-				BUG();
+			BUG_ON(!area->pages[i]);
 			__free_page(area->pages[i]);
 		}