diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-05-08 20:22:15 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-05-08 20:22:15 +0200 |
| commit | eff2851fd0934a1fb561c05ba8b292b4bf68bc33 (patch) | |
| tree | 09078669c76f513a4c48c47eab908959baef38b0 /Documentation | |
| parent | fcb38df164b7f0791e244c9f5ca21c1b061c9e86 (diff) | |
| parent | 072cab659c9368586d6417cfd6ec2d2c68469c67 (diff) | |
Merge tag 'v4.0.2' into toradex_vf_4.0-next
This is the 4.0.2 stable release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/scaling.txt | 2 | ||||
| -rw-r--r-- | Documentation/virtual/kvm/devices/s390_flic.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/networking/scaling.txt b/Documentation/networking/scaling.txt index 99ca40e8e810..5c204df6b689 100644 --- a/Documentation/networking/scaling.txt +++ b/Documentation/networking/scaling.txt @@ -282,7 +282,7 @@ following is true: - The current CPU's queue head counter >= the recorded tail counter value in rps_dev_flow[i] -- The current CPU is unset (equal to RPS_NO_CPU) +- The current CPU is unset (>= nr_cpu_ids) - The current CPU is offline After this check, the packet is sent to the (possibly updated) current diff --git a/Documentation/virtual/kvm/devices/s390_flic.txt b/Documentation/virtual/kvm/devices/s390_flic.txt index 4ceef53164b0..d1ad9d5cae46 100644 --- a/Documentation/virtual/kvm/devices/s390_flic.txt +++ b/Documentation/virtual/kvm/devices/s390_flic.txt @@ -27,6 +27,9 @@ Groups: Copies all floating interrupts into a buffer provided by userspace. When the buffer is too small it returns -ENOMEM, which is the indication for userspace to try again with a bigger buffer. + -ENOBUFS is returned when the allocation of a kernelspace buffer has + failed. + -EFAULT is returned when copying data to userspace failed. All interrupts remain pending, i.e. are not deleted from the list of currently pending interrupts. attr->addr contains the userspace address of the buffer into which all |