diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-31 18:21:17 -0500 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-03-31 18:21:17 -0500 |
commit | 8abd8e298eb15e2c1b993df0634daf29e43e0aab (patch) | |
tree | a83df11829c6ffdee4a787b57f899f87813a6fb1 | |
parent | 9bc98fc6fd3d07f37b597601489df200e0024222 (diff) |
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>
-rw-r--r-- | kernel/printk.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 8cc19431e74b..c056f3324432 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -360,8 +360,7 @@ static void call_console_drivers(unsigned long start, unsigned long end) | |||
360 | unsigned long cur_index, start_print; | 360 | unsigned long cur_index, start_print; |
361 | static int msg_level = -1; | 361 | static int msg_level = -1; |
362 | 362 | ||
363 | if (((long)(start - end)) > 0) | 363 | BUG_ON(((long)(start - end)) > 0); |
364 | BUG(); | ||
365 | 364 | ||
366 | cur_index = start; | 365 | cur_index = start; |
367 | start_print = start; | 366 | start_print = start; |
@@ -708,8 +707,7 @@ int __init add_preferred_console(char *name, int idx, char *options) | |||
708 | */ | 707 | */ |
709 | void acquire_console_sem(void) | 708 | void acquire_console_sem(void) |
710 | { | 709 | { |
711 | if (in_interrupt()) | 710 | BUG_ON(in_interrupt()); |
712 | BUG(); | ||
713 | down(&console_sem); | 711 | down(&console_sem); |
714 | console_locked = 1; | 712 | console_locked = 1; |
715 | console_may_schedule = 1; | 713 | console_may_schedule = 1; |