diff options
| author | Dave Jones <davej@redhat.com> | 2006-04-19 00:19:55 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-04-19 00:19:55 +0200 |
| commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
| tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /kernel/printk.c | |
| parent | [CPUFREQ] x86_64: Proper null pointer check in powernow_k8_get (diff) | |
| parent | x86: be careful about tailcall breakage for sys_open[at] too (diff) | |
| download | linux-f1f76afd71e0f17af9a35fcb649f4bab53304a4d.tar.xz linux-f1f76afd71e0f17af9a35fcb649f4bab53304a4d.zip | |
Merge ../linus
Diffstat (limited to 'kernel/printk.c')
| -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) 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; |