diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-03-23 06:00:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 10:38:16 -0500 |
commit | 91368d73e4b60d577ad171e5bd315b564265fcdb (patch) | |
tree | 067d3738aa4bf8d49623632bb47952aca6f8f965 /kernel/sched.c | |
parent | 3257545e40a769cbef98cf13eabe50f00712991e (diff) |
[PATCH] make bug messages more consistent
Consolidate all kernel bug printouts to begin with the "BUG: " string.
Makes it easier to find them in large bootup logs.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index a5bd60453eae..7ffaabd64f89 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -2873,7 +2873,7 @@ asmlinkage void __sched schedule(void) | |||
2873 | */ | 2873 | */ |
2874 | if (likely(!current->exit_state)) { | 2874 | if (likely(!current->exit_state)) { |
2875 | if (unlikely(in_atomic())) { | 2875 | if (unlikely(in_atomic())) { |
2876 | printk(KERN_ERR "scheduling while atomic: " | 2876 | printk(KERN_ERR "BUG: scheduling while atomic: " |
2877 | "%s/0x%08x/%d\n", | 2877 | "%s/0x%08x/%d\n", |
2878 | current->comm, preempt_count(), current->pid); | 2878 | current->comm, preempt_count(), current->pid); |
2879 | dump_stack(); | 2879 | dump_stack(); |
@@ -6074,7 +6074,7 @@ void __might_sleep(char *file, int line) | |||
6074 | if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) | 6074 | if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) |
6075 | return; | 6075 | return; |
6076 | prev_jiffy = jiffies; | 6076 | prev_jiffy = jiffies; |
6077 | printk(KERN_ERR "Debug: sleeping function called from invalid" | 6077 | printk(KERN_ERR "BUG: sleeping function called from invalid" |
6078 | " context at %s:%d\n", file, line); | 6078 | " context at %s:%d\n", file, line); |
6079 | printk("in_atomic():%d, irqs_disabled():%d\n", | 6079 | printk("in_atomic():%d, irqs_disabled():%d\n", |
6080 | in_atomic(), irqs_disabled()); | 6080 | in_atomic(), irqs_disabled()); |