summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-04-23 12:48:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-04-23 12:48:05 -0700
commitfa8d7cdc849e2ffa1748157277fc1d73315a4251 (patch)
tree818e1cc0b73399c8d1f8147e9647cfbdfc4ad5f0 /kernel
parent94836ecf1e7378b64d37624fbb81fe48fbd4c772 (diff)
parentb72f8051f34b8164a62391e3676edc34523c5952 (diff)
downloadlinux-fa8d7cdc849e2ffa1748157277fc1d73315a4251.tar.bz2
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Thomas Gleixner: "The (hopefully) final fix for the irq affinity spreading logic" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq/affinity: Fix calculating vectors to assign
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/affinity.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c
index d052947fe785..e2d356dd7581 100644
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
@@ -98,7 +98,7 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
int ncpus, v, vecs_to_assign, vecs_per_node;
/* Spread the vectors per node */
- vecs_per_node = (affv - curvec) / nodes;
+ vecs_per_node = (affv - (curvec - affd->pre_vectors)) / nodes;
/* Get the cpus on this node which are in the mask */
cpumask_and(nmsk, cpu_online_mask, cpumask_of_node(n));