From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Sun, 2 Apr 2006 11:45:55 +0000 (+0200)
Subject: BUG_ON() Conversion in kernel/signal.c
X-Git-Tag: v2.6.17-rc1~10^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f31252cb61d5bc641cdef8a069a2ca5a77855f2;p=linux-2.6

BUG_ON() Conversion in kernel/signal.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/kernel/timer.c b/kernel/timer.c
index 6b812c0473..c3a874f139 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1479,8 +1479,7 @@ register_time_interpolator(struct time_interpolator *ti)
 	unsigned long flags;
 
 	/* Sanity check */
-	if (ti->frequency == 0 || ti->mask == 0)
-		BUG();
+	BUG_ON(ti->frequency == 0 || ti->mask == 0);
 
 	ti->nsec_per_cyc = ((u64)NSEC_PER_SEC << ti->shift) / ti->frequency;
 	spin_lock(&time_interpolator_lock);