summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2016-10-10 14:10:51 +0200
committerJens Axboe <axboe@fb.com>2016-10-21 23:45:47 +0200
commitf660f6066716b700148f60dba3461e65efff3123 (patch)
tree1c20f17627699759429a5fa99ce307a20f41800a /kernel
parentMerge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff)
downloadlinux-f660f6066716b700148f60dba3461e65efff3123.tar.xz
linux-f660f6066716b700148f60dba3461e65efff3123.zip
softirq: Display IRQ_POLL for irq-poll statistics
This library was moved to the generic area and was renamed to irq-poll. Hence, update proc/softirqs output accordingly. Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/softirq.c2
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"
};