From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 22 May 2018 17:52:17 +0000 (+0200)
Subject: 4.16-stable patches
X-Git-Tag: v3.18.110~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7f41497a40a65bce4f0741d01057099316594f6;p=thirdparty%2Fkernel%2Fstable-queue.git

4.16-stable patches

added patches:
	net-mlx5-fix-build-break-when-config_smp-n.patch
---

diff --git a/queue-4.16/net-mlx5-fix-build-break-when-config_smp-n.patch b/queue-4.16/net-mlx5-fix-build-break-when-config_smp-n.patch
new file mode 100644
index 00000000000..65181980f43
--- /dev/null
+++ b/queue-4.16/net-mlx5-fix-build-break-when-config_smp-n.patch
@@ -0,0 +1,60 @@
+From e3ca34880652250f524022ad89e516f8ba9a805b Mon Sep 17 00:00:00 2001
+From: Saeed Mahameed <saeedm@mellanox.com>
+Date: Mon, 14 May 2018 15:38:10 -0700
+Subject: net/mlx5: Fix build break when CONFIG_SMP=n
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Saeed Mahameed <saeedm@mellanox.com>
+
+commit e3ca34880652250f524022ad89e516f8ba9a805b upstream.
+
+Avoid using the kernel's irq_descriptor and return IRQ vector affinity
+directly from the driver.
+
+This fixes the following build break when CONFIG_SMP=n
+
+include/linux/mlx5/driver.h: In function ‘mlx5_get_vector_affinity_hint’:
+include/linux/mlx5/driver.h:1299:13: error:
+        ‘struct irq_desc’ has no member named ‘affinity_hint’
+
+Fixes: 6082d9c9c94a ("net/mlx5: Fix mlx5_get_vector_affinity function")
+Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+CC: Randy Dunlap <rdunlap@infradead.org>
+CC: Guenter Roeck <linux@roeck-us.net>
+CC: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Israel Rukshin <israelr@mellanox.com>
+Reported-by: kbuild test robot <lkp@intel.com>
+Reported-by: Randy Dunlap <rdunlap@infradead.org>
+Tested-by: Randy Dunlap <rdunlap@infradead.org>
+Acked-by: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/mlx5/driver.h |   12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+--- a/include/linux/mlx5/driver.h
++++ b/include/linux/mlx5/driver.h
+@@ -1271,17 +1271,7 @@ enum {
+ static inline const struct cpumask *
+ mlx5_get_vector_affinity_hint(struct mlx5_core_dev *dev, int vector)
+ {
+-	struct irq_desc *desc;
+-	unsigned int irq;
+-	int eqn;
+-	int err;
+-
+-	err = mlx5_vector2eqn(dev, vector, &eqn, &irq);
+-	if (err)
+-		return NULL;
+-
+-	desc = irq_to_desc(irq);
+-	return desc->affinity_hint;
++	return dev->priv.irq_info[vector].mask;
+ }
+ 
+ #endif /* MLX5_DRIVER_H */
diff --git a/queue-4.16/series b/queue-4.16/series
new file mode 100644
index 00000000000..86dec53404f
--- /dev/null
+++ b/queue-4.16/series
@@ -0,0 +1 @@
+net-mlx5-fix-build-break-when-config_smp-n.patch