Merge branch 'irq/for-block' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-4.21/block

Pull in the irq affinity commits, that are staged through Thomas's
tree.

* 'irq/for-block' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq/affinity: Add support for allocating interrupt sets
  genirq/affinity: Pass first vector to __irq_build_affinity_masks()
  genirq/affinity: Move two stage affinity spreading into a helper function
  genirq/affinity: Spread IRQs to all available NUMA nodes

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 1d6711c28271..ca397ff40836 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -247,10 +247,14 @@ struct irq_affinity_notify {
  *                      the MSI(-X) vector space
  * @post_vectors:       Don't apply affinity to @post_vectors at end of
  *                      the MSI(-X) vector space
+ * @nr_sets:            Length of passed in *sets array
+ * @sets:               Number of affinitized sets
  */
 struct irq_affinity {
         int     pre_vectors;
         int     post_vectors;
+        int     nr_sets;
+        int     *sets;
 };
 
 #if defined(CONFIG_SMP)