diff options
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/icm.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/icm.h | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/qp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c index eb1747e1937d..97c9b1db1d27 100644 --- a/drivers/net/ethernet/mellanox/mlx4/icm.c +++ b/drivers/net/ethernet/mellanox/mlx4/icm.c | |||
| @@ -246,7 +246,7 @@ int mlx4_UNMAP_ICM_AUX(struct mlx4_dev *dev) | |||
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj, | 248 | int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj, |
| 249 | int gfp) | 249 | gfp_t gfp) |
| 250 | { | 250 | { |
| 251 | u32 i = (obj & (table->num_obj - 1)) / | 251 | u32 i = (obj & (table->num_obj - 1)) / |
| 252 | (MLX4_TABLE_CHUNK_SIZE / table->obj_size); | 252 | (MLX4_TABLE_CHUNK_SIZE / table->obj_size); |
diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.h b/drivers/net/ethernet/mellanox/mlx4/icm.h index 067e6e0af36c..0c7364550150 100644 --- a/drivers/net/ethernet/mellanox/mlx4/icm.h +++ b/drivers/net/ethernet/mellanox/mlx4/icm.h | |||
| @@ -72,7 +72,7 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages, | |||
| 72 | void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm, int coherent); | 72 | void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm, int coherent); |
| 73 | 73 | ||
| 74 | int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj, | 74 | int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj, |
| 75 | int gfp); | 75 | gfp_t gfp); |
| 76 | void mlx4_table_put(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj); | 76 | void mlx4_table_put(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj); |
| 77 | int mlx4_table_get_range(struct mlx4_dev *dev, struct mlx4_icm_table *table, | 77 | int mlx4_table_get_range(struct mlx4_dev *dev, struct mlx4_icm_table *table, |
| 78 | u32 start, u32 end); | 78 | u32 start, u32 end); |
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c index 917f0d0ba7c6..07198cacbb20 100644 --- a/drivers/net/ethernet/mellanox/mlx4/qp.c +++ b/drivers/net/ethernet/mellanox/mlx4/qp.c | |||
| @@ -316,7 +316,7 @@ err_out: | |||
| 316 | return err; | 316 | return err; |
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | static int mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn, int gfp) | 319 | static int mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn, gfp_t gfp) |
| 320 | { | 320 | { |
| 321 | u64 param = 0; | 321 | u64 param = 0; |
| 322 | 322 | ||
