diff options
| author | Joe Perches <joe@perches.com> | 2014-01-27 17:07:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-27 21:02:40 -0800 |
| commit | 403227641533c4227d44d14f25c8f3676f6e7436 (patch) | |
| tree | 7e7ca15762b47e44d3ba25c6ee5207c08f75540b /kernel/softirq.c | |
| parent | 2e702b9f6cba4eb87d90e2a2d425a1fc05eec803 (diff) | |
| download | linux-403227641533c4227d44d14f25c8f3676f6e7436.tar.gz linux-403227641533c4227d44d14f25c8f3676f6e7436.tar.bz2 linux-403227641533c4227d44d14f25c8f3676f6e7436.zip | |
softirq: convert printks to pr_<level>
Use a more current logging style.
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index ba79bbfe380e..2674354a5cb8 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -8,6 +8,8 @@ * Rewritten. Old one was good in 2.2, but in 2.3 it was immoral. --ANK (990903) */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/export.h> #include <linux/kernel_stat.h> #include <linux/interrupt.h> @@ -269,7 +271,7 @@ restart: h->action(h); trace_softirq_exit(vec_nr); if (unlikely(prev_count != preempt_count())) { - printk(KERN_ERR "huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n", + pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n", vec_nr, softirq_to_name[vec_nr], h->action, prev_count, preempt_count()); preempt_count_set(prev_count); @@ -568,7 +570,7 @@ EXPORT_SYMBOL(tasklet_init); void tasklet_kill(struct tasklet_struct *t) { if (in_interrupt()) - printk("Attempt to kill tasklet from interrupt\n"); + pr_notice("Attempt to kill tasklet from interrupt\n"); while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) { do { |