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

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

diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index 1898d6e7cce5374b48d811c7cf00e041c20d0b05..62c71fadb4d97d10a29f0e05452b63f888fb0814 100644 (file)
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -81,7 +81,7 @@ int ipz_queue_abs_to_offset(struct ipz_queue *queue, u64 addr, u64 *q_offset)
 {
        int i;
        for (i = 0; i < queue->queue_length / queue->pagesize; i++) {
-               u64 page = (u64)virt_to_abs(queue->queue_pages[i]);
+               u64 page = __pa(queue->queue_pages[i]);
                if (addr >= page && addr < page + queue->pagesize) {
                        *q_offset = addr - page + i * queue->pagesize;
                        return 0;