diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:47:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:47:40 +0100 |
| commit | c29c716662d0cefc0cda4903aea5ed6794174679 (patch) | |
| tree | 01d4dc47933e1bcbeca8d53b0cf5c1f70da04535 /kernel/softirq.c | |
| parent | e63650840e8b053aa09ad934877e87e9941ed135 (diff) | |
| parent | 405c0759712f57b680f66aee9c55cd06ad1cbdef (diff) | |
| download | linux-c29c716662d0cefc0cda4903aea5ed6794174679.tar.bz2 | |
Merge branch 'core/urgent' into x86/fpu, to merge fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 1bf81ef91375..744fa611cae0 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -58,7 +58,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp DEFINE_PER_CPU(struct task_struct *, ksoftirqd); const char * const softirq_to_name[NR_SOFTIRQS] = { - "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL", + "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "IRQ_POLL", "TASKLET", "SCHED", "HRTIMER", "RCU" }; |