From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Fri, 31 Mar 2006 23:21:17 +0000 (+0200)
Subject: BUG_ON() Conversion in kernel/printk.c
X-Git-Tag: v2.6.17-rc1~10^2~34
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8abd8e298eb15e2c1b993df0634daf29e43e0aab;p=linux-2.6

BUG_ON() Conversion in kernel/printk.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/printk.c b/kernel/printk.c
index 8cc19431e7..c056f33244 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -360,8 +360,7 @@ static void call_console_drivers(unsigned long start, unsigned long end)
 	unsigned long cur_index, start_print;
 	static int msg_level = -1;
 
-	if (((long)(start - end)) > 0)
-		BUG();
+	BUG_ON(((long)(start - end)) > 0);
 
 	cur_index = start;
 	start_print = start;
@@ -708,8 +707,7 @@ int __init add_preferred_console(char *name, int idx, char *options)
  */
 void acquire_console_sem(void)
 {
-	if (in_interrupt())
-		BUG();
+	BUG_ON(in_interrupt());
 	down(&console_sem);
 	console_locked = 1;
 	console_may_schedule = 1;