diff options
author | Joe Perches <joe@perches.com> | 2014-01-27 20:07:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 00:02:40 -0500 |
commit | 403227641533c4227d44d14f25c8f3676f6e7436 (patch) | |
tree | 7e7ca15762b47e44d3ba25c6ee5207c08f75540b /kernel | |
parent | 2e702b9f6cba4eb87d90e2a2d425a1fc05eec803 (diff) |
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')
-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 @@ | |||
8 | * Rewritten. Old one was good in 2.2, but in 2.3 it was immoral. --ANK (990903) | 8 | * Rewritten. Old one was good in 2.2, but in 2.3 it was immoral. --ANK (990903) |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
12 | |||
11 | #include <linux/export.h> | 13 | #include <linux/export.h> |
12 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
13 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
@@ -269,7 +271,7 @@ restart: | |||
269 | h->action(h); | 271 | h->action(h); |
270 | trace_softirq_exit(vec_nr); | 272 | trace_softirq_exit(vec_nr); |
271 | if (unlikely(prev_count != preempt_count())) { | 273 | if (unlikely(prev_count != preempt_count())) { |
272 | printk(KERN_ERR "huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n", | 274 | pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n", |
273 | vec_nr, softirq_to_name[vec_nr], h->action, | 275 | vec_nr, softirq_to_name[vec_nr], h->action, |
274 | prev_count, preempt_count()); | 276 | prev_count, preempt_count()); |
275 | preempt_count_set(prev_count); | 277 | preempt_count_set(prev_count); |
@@ -568,7 +570,7 @@ EXPORT_SYMBOL(tasklet_init); | |||
568 | void tasklet_kill(struct tasklet_struct *t) | 570 | void tasklet_kill(struct tasklet_struct *t) |
569 | { | 571 | { |
570 | if (in_interrupt()) | 572 | if (in_interrupt()) |
571 | printk("Attempt to kill tasklet from interrupt\n"); | 573 | pr_notice("Attempt to kill tasklet from interrupt\n"); |
572 | 574 | ||
573 | while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) { | 575 | while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) { |
574 | do { | 576 | do { |