diff --git a/[refs] b/[refs] index f88bb133ef02..4f2ff08337db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f96f93f02b7637491a1637dee12dcdcd40b9802 +refs/heads/master: 899039e8746bb9a09b6487ddb8ab2275ce9d0256 diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c index a5e81231ca7a..65ff3e3961b4 100644 --- a/trunk/kernel/softirq.c +++ b/trunk/kernel/softirq.c @@ -55,9 +55,8 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); char *softirq_to_name[NR_SOFTIRQS] = { - "HI_SOFTIRQ", "TIMER_SOFTIRQ", "NET_TX_SOFTIRQ", "NET_RX_SOFTIRQ", - "BLOCK_SOFTIRQ", "TASKLET_SOFTIRQ", "SCHED_SOFTIRQ", "HRTIMER_SOFTIRQ", - "RCU_SOFTIRQ" + "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", + "TASKLET", "SCHED", "HRTIMER", "RCU" }; /*