diff --git a/[refs] b/[refs] index 0ccabb7f16d8..3075c6b9caa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6af75dac3978d0b4d83939cb5d244b2a844820e +refs/heads/master: 19af395d7c0daaafdebd441a162128aaac575912 diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c index 35c70c9e24d8..e49a288fa479 100644 --- a/trunk/kernel/irq/manage.c +++ b/trunk/kernel/irq/manage.c @@ -818,7 +818,7 @@ static void irq_thread_dtor(struct callback_head *unused) action = kthread_data(tsk); pr_err("exiting task \"%s\" (%d) is an active IRQ thread (irq %d)\n", - tsk->comm ? tsk->comm : "", tsk->pid, action->irq); + tsk->comm, tsk->pid, action->irq); desc = irq_to_desc(action->irq);