Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 27 deletions

diff --git a/drivers/net/mlx4/icm.c b/drivers/net/mlx4/icm.c
index b07e4dee80aa..02393fdf44c1 100644
--- a/drivers/net/mlx4/icm.c
+++ b/drivers/net/mlx4/icm.c
@@ -210,38 +210,12 @@ static int mlx4_MAP_ICM(struct mlx4_dev *dev, struct mlx4_icm *icm, u64 virt)
         return mlx4_map_cmd(dev, MLX4_CMD_MAP_ICM, icm, virt);
 }
 
-int mlx4_UNMAP_ICM(struct mlx4_dev *dev, u64 virt, u32 page_count)
+static int mlx4_UNMAP_ICM(struct mlx4_dev *dev, u64 virt, u32 page_count)
 {
         return mlx4_cmd(dev, virt, page_count, 0, MLX4_CMD_UNMAP_ICM,
                         MLX4_CMD_TIME_CLASS_B);
 }
 
-int mlx4_MAP_ICM_page(struct mlx4_dev *dev, u64 dma_addr, u64 virt)
-{
-        struct mlx4_cmd_mailbox *mailbox;
-        __be64 *inbox;
-        int err;
-
-        mailbox = mlx4_alloc_cmd_mailbox(dev);
-        if (IS_ERR(mailbox))
-                return PTR_ERR(mailbox);
-        inbox = mailbox->buf;
-
-        inbox[0] = cpu_to_be64(virt);
-        inbox[1] = cpu_to_be64(dma_addr);
-
-        err = mlx4_cmd(dev, mailbox->dma, 1, 0, MLX4_CMD_MAP_ICM,
-                       MLX4_CMD_TIME_CLASS_B);
-
-        mlx4_free_cmd_mailbox(dev, mailbox);
-
-        if (!err)
-                mlx4_dbg(dev, "Mapped page at %llx to %llx for ICM.\n",
-                          (unsigned long long) dma_addr, (unsigned long long) virt);
-
-        return err;
-}
-
 int mlx4_MAP_ICM_AUX(struct mlx4_dev *dev, struct mlx4_icm *icm)
 {
         return mlx4_map_cmd(dev, MLX4_CMD_MAP_ICM_AUX, icm, -1);