diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-12-15 20:10:44 +0100 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-12-15 20:10:44 +0100 |
| commit | c6333f9f9f7646e311248a09e8ed96126a97aba8 (patch) | |
| tree | 1a86124c5b43fa858f1d8d7beb99bcd29d6d6ab7 /include/trace/events | |
| parent | Linux 4.4-rc5 (diff) | |
| parent | IB/iser: Convert to CQ abstraction (diff) | |
| download | linux-c6333f9f9f7646e311248a09e8ed96126a97aba8.tar.xz linux-c6333f9f9f7646e311248a09e8ed96126a97aba8.zip | |
Merge branch 'rdma-cq.2' of git://git.infradead.org/users/hch/rdma into 4.5/rdma-cq
Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/srp/ib_srp.c - Conflicts with changes in
ib_srp.c introduced during 4.4-rc updates
Diffstat (limited to 'include/trace/events')
| -rw-r--r-- | include/trace/events/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h index ff8f6c091a15..f95f25e786ef 100644 --- a/include/trace/events/irq.h +++ b/include/trace/events/irq.h @@ -15,7 +15,7 @@ struct softirq_action; softirq_name(NET_TX) \ softirq_name(NET_RX) \ softirq_name(BLOCK) \ - softirq_name(BLOCK_IOPOLL) \ + softirq_name(IRQ_POLL) \ softirq_name(TASKLET) \ softirq_name(SCHED) \ softirq_name(HRTIMER) \ |