Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[sfrench/cifs-2.6.git] / drivers / infiniband / hw / amso1100 / c2_alloc.c

diff --git a/drivers/infiniband/hw/amso1100/c2_alloc.c b/drivers/infiniband/hw/amso1100/c2_alloc.c
index 1d2529992c0c954018faea5090ada7d1597d67ce..028a60bbfca9ce2db18fb7506a8c84649d4e20a6 100644 (file)
--- a/drivers/infiniband/hw/amso1100/c2_alloc.c
+++ b/drivers/infiniband/hw/amso1100/c2_alloc.c
@@ -115,7 +115,7 @@ u16 *c2_alloc_mqsp(struct c2_dev *c2dev, struct sp_chunk *head,
                            ((unsigned long) &(head->shared_ptr[mqsp]) -
                             (unsigned long) head);
                pr_debug("%s addr %p dma_addr %llx\n", __FUNCTION__,
-                        &(head->shared_ptr[mqsp]), (u64)*dma_addr);
+                        &(head->shared_ptr[mqsp]), (unsigned long long) *dma_addr);
                return &(head->shared_ptr[mqsp]);
        }
        return NULL;