diff --git a/[refs] b/[refs] index 6e78cb21dcf4..f060931b151c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bc98fc6fd3d07f37b597601489df200e0024222 +refs/heads/master: 8abd8e298eb15e2c1b993df0634daf29e43e0aab diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 8cc19431e74b..c056f3324432 100644 --- a/trunk/kernel/printk.c +++ b/trunk/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;