diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 17:15:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 17:15:20 +0300 |
| commit | cbbfb0ae2ca979222297062647ced653682a6cc7 (patch) | |
| tree | 15744f08287f776eb53c3fd1c97817f0e320875a /include | |
| parent | 42f52e1c59bdb78cad945b2dd34fa1f892239a39 (diff) | |
| parent | 76f99ae5b54d48430d1f0c5512a84da0ff9761e0 (diff) | |
| download | linux-cbbfb0ae2ca979222297062647ced653682a6cc7.tar.xz | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 apic updates from Ingo Molnar:
"Improve the spreading of managed IRQs at allocation time"
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irq/matrix: Spread managed interrupts on allocation
irq/matrix: Split out the CPU selection code into a helper
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irq.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 201de12a9957..c9bffda04a45 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -1151,7 +1151,8 @@ void irq_matrix_offline(struct irq_matrix *m); void irq_matrix_assign_system(struct irq_matrix *m, unsigned int bit, bool replace); int irq_matrix_reserve_managed(struct irq_matrix *m, const struct cpumask *msk); void irq_matrix_remove_managed(struct irq_matrix *m, const struct cpumask *msk); -int irq_matrix_alloc_managed(struct irq_matrix *m, unsigned int cpu); +int irq_matrix_alloc_managed(struct irq_matrix *m, const struct cpumask *msk, + unsigned int *mapped_cpu); void irq_matrix_reserve(struct irq_matrix *m); void irq_matrix_remove_reserved(struct irq_matrix *m); int irq_matrix_alloc(struct irq_matrix *m, const struct cpumask *msk, |