diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-12-22 17:03:15 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-12-22 17:03:15 -0500 |
| commit | 882f3b3b916a01c703bf7516800a0dca741cd3e7 (patch) | |
| tree | 3a67f04a2b31985bb8044d39f0f5ebd9858658ae /Documentation | |
| parent | 182a2da0c768a9ec64abb0d6009667057f1c06af (diff) | |
| parent | c6333f9f9f7646e311248a09e8ed96126a97aba8 (diff) | |
| download | linux-882f3b3b916a01c703bf7516800a0dca741cd3e7.tar.gz linux-882f3b3b916a01c703bf7516800a0dca741cd3e7.tar.bz2 linux-882f3b3b916a01c703bf7516800a0dca741cd3e7.zip | |
Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5
Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/iser/iser_verbs.c
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 |