|
@@ -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 {
|