Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into next

[firefly-linux-kernel-4.4.55.git] / drivers / infiniband / hw / ehca / ehca_cq.c

diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index d9b0ebcb67d7371946f8a644d26066e3a175df28..8f5290147e8a8d1fbeb5399f230a900c6e023c97 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -220,7 +220,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
                        cq = ERR_PTR(-EAGAIN);
                        goto create_cq_exit4;
                }
-               rpage = virt_to_abs(vpage);
+               rpage = __pa(vpage);
 
                h_ret = hipz_h_register_rpage_cq(adapter_handle,
                                                 my_cq->ipz_cq_handle,