diff options
author | David S. Miller <davem@davemloft.net> | 2014-06-02 03:18:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-02 03:18:48 -0400 |
commit | 96b2e73c5471542cb9c622c4360716684f8797ed (patch) | |
tree | 8afddc81c11b89232a32ade9f51d25619de337fb /drivers/net/ethernet/mellanox/mlx4/eq.c | |
parent | d64eed1d9bb57fb7a8daf9b6127dd8b558e6d262 (diff) |
Revert "net/mlx4_en: Use affinity hint"
This reverts commit 70a640d0dae3a9b1b222ce673eb5d92c263ddd61.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/eq.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/eq.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c index f91659e5fa13..d954ec1eac17 100644 --- a/drivers/net/ethernet/mellanox/mlx4/eq.c +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c | |||
@@ -1376,7 +1376,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev) | |||
1376 | EXPORT_SYMBOL(mlx4_test_interrupts); | 1376 | EXPORT_SYMBOL(mlx4_test_interrupts); |
1377 | 1377 | ||
1378 | int mlx4_assign_eq(struct mlx4_dev *dev, char *name, struct cpu_rmap *rmap, | 1378 | int mlx4_assign_eq(struct mlx4_dev *dev, char *name, struct cpu_rmap *rmap, |
1379 | int *vector, cpumask_var_t cpu_hint_mask) | 1379 | int *vector) |
1380 | { | 1380 | { |
1381 | 1381 | ||
1382 | struct mlx4_priv *priv = mlx4_priv(dev); | 1382 | struct mlx4_priv *priv = mlx4_priv(dev); |
@@ -1411,15 +1411,6 @@ int mlx4_assign_eq(struct mlx4_dev *dev, char *name, struct cpu_rmap *rmap, | |||
1411 | } | 1411 | } |
1412 | mlx4_assign_irq_notifier(priv, dev, | 1412 | mlx4_assign_irq_notifier(priv, dev, |
1413 | priv->eq_table.eq[vec].irq); | 1413 | priv->eq_table.eq[vec].irq); |
1414 | if (cpu_hint_mask) { | ||
1415 | err = irq_set_affinity_hint( | ||
1416 | priv->eq_table.eq[vec].irq, | ||
1417 | cpu_hint_mask); | ||
1418 | if (err) { | ||
1419 | mlx4_warn(dev, "Failed setting affinity hint\n"); | ||
1420 | /*we dont want to break here*/ | ||
1421 | } | ||
1422 | } | ||
1423 | 1414 | ||
1424 | eq_set_ci(&priv->eq_table.eq[vec], 1); | 1415 | eq_set_ci(&priv->eq_table.eq[vec], 1); |
1425 | } | 1416 | } |
@@ -1450,8 +1441,6 @@ void mlx4_release_eq(struct mlx4_dev *dev, int vec) | |||
1450 | irq_set_affinity_notifier( | 1441 | irq_set_affinity_notifier( |
1451 | priv->eq_table.eq[vec].irq, | 1442 | priv->eq_table.eq[vec].irq, |
1452 | NULL); | 1443 | NULL); |
1453 | irq_set_affinity_hint(priv->eq_table.eq[vec].irq, | ||
1454 | NULL); | ||
1455 | free_irq(priv->eq_table.eq[vec].irq, | 1444 | free_irq(priv->eq_table.eq[vec].irq, |
1456 | &priv->eq_table.eq[vec]); | 1445 | &priv->eq_table.eq[vec]); |
1457 | priv->msix_ctl.pool_bm &= ~(1ULL << i); | 1446 | priv->msix_ctl.pool_bm &= ~(1ULL << i); |