Hi all,
After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/net/ethernet/mellanox/mlx5/core/main.c: In function 'mlx5_irq_set_affinity_hint':
drivers/net/ethernet/mellanox/mlx5/core/main.c:474:2: error: implicit declaration of function 'cpumask_set_cpu_local_first' [-Werror=implicit-function-declaration]
err = cpumask_set_cpu_local_first(i, numa_node, priv->irq_info[i].mask);
^
Caused by commit db058a186f98 ("net/mlx5_core: Set irq affinity hints")
interacting with commit f36963c9d3f6 ("cpumask_set_cpu_local_first =>
cpumask_local_spread, lament") from Linus' tree.
I have applied the following merge fix patch (Dave, you could do this
by back merging commit f36963c9d3f6 from Linus' tree - which is based
on v4.1-rc2 if that worries you). Please yell if this is not correct
(it does build).
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 1 Jun 2015 13:36:49 +1000
Subject: [PATCH] net/mlx5_core: merge fix for cpumask_set_cpu_local_first API change
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/mellanox/mlx5/core/main.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 1c37f587426d..2510fed3494d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -471,11 +471,8 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
return -ENOMEM;
}
- err = cpumask_set_cpu_local_first(i, numa_node, priv->irq_info[i].mask);
- if (err) {
- mlx5_core_warn(mdev, "cpumask_set_cpu_local_first failed");
- goto err_clear_mask;
- }
+ cpumask_set_cpu(cpumask_local_spread(i, numa_node),
+ priv->irq_info[i].mask);
err = irq_set_affinity_hint(irq, priv->irq_info[i].mask);
if (err) {
--
2.1.4
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp8CzkY7rRVS.pgp
Description: OpenPGP digital signature
