diff --git a/[refs] b/[refs] index e11a9846bcd4..5d3b93c1e046 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d588f8bb79c86a5826f66946c1ea026b6b07bd8 +refs/heads/master: 0624b072f230af4f24c112019b04f898ef7b4e2c diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c b/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c index caf8cb891da4..d4fc4118ddd5 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c @@ -206,11 +206,10 @@ static int ipath_get_base_info(struct file *fp, kinfo->spi_subport_rcvhdr_base = (u64) pd->subport_rcvhdr_base & MMAP64_MASK; ipath_cdbg(PROC, "port %u flags %x %llx %llx %llx\n", - kinfo->spi_port, - kinfo->spi_runtime_flags, - kinfo->spi_subport_uregbase, - kinfo->spi_subport_rcvegrbuf, - kinfo->spi_subport_rcvhdr_base); + kinfo->spi_port, kinfo->spi_runtime_flags, + (unsigned long long) kinfo->spi_subport_uregbase, + (unsigned long long) kinfo->spi_subport_rcvegrbuf, + (unsigned long long) kinfo->spi_subport_rcvhdr_base); } if (copy_to_user(ubase, kinfo, sizeof(*kinfo)))