diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-12-15 14:10:44 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-12-15 14:10:44 -0500 |
| commit | c6333f9f9f7646e311248a09e8ed96126a97aba8 (patch) | |
| tree | 1a86124c5b43fa858f1d8d7beb99bcd29d6d6ab7 /Documentation | |
| parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
| parent | cfeb91b375ad5f52665e00d374a4e403d2e6063e (diff) | |
| download | blackbird-op-linux-c6333f9f9f7646e311248a09e8ed96126a97aba8.tar.gz blackbird-op-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 'Documentation')
| -rw-r--r-- | Documentation/kernel-per-CPU-kthreads.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-per-CPU-kthreads.txt b/Documentation/kernel-per-CPU-kthreads.txt index f4cbfe0ba108..edec3a3e648d 100644 --- a/Documentation/kernel-per-CPU-kthreads.txt +++ b/Documentation/kernel-per-CPU-kthreads.txt @@ -90,7 +90,7 @@ BLOCK_SOFTIRQ: Do all of the following: from being initiated from tasks that might run on the CPU to be de-jittered. (It is OK to force this CPU offline and then bring it back online before you start your application.) -BLOCK_IOPOLL_SOFTIRQ: Do all of the following: +IRQ_POLL_SOFTIRQ: Do all of the following: 1. Force block-device interrupts onto some other CPU. 2. Initiate any block I/O and block-I/O polling on other CPUs. 3. Once your application has started, prevent CPU-hotplug operations |
