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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 5eee6665919a..f24b79b805f2 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -790,7 +790,7 @@ static int mthca_setup_hca(struct mthca_dev *dev)
                 goto err_uar_table_free;
         }
 
-        dev->kar = ioremap(dev->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
+        dev->kar = ioremap((phys_addr_t) dev->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
         if (!dev->kar) {
                 mthca_err(dev, "Couldn't map kernel access region, "
                           "aborting.\n");
@@ -1043,6 +1043,9 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
                 }
         }
 
+        /* We can handle large RDMA requests, so allow larger segments. */
+        dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024);
+
         mdev = (struct mthca_dev *) ib_alloc_device(sizeof *mdev);
         if (!mdev) {
                 dev_err(&pdev->dev, "Device struct alloc failed, "