diff options
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_file_ops.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_file_ops.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c index b16ceb241db3..30bb16efb378 100644 --- a/drivers/infiniband/hw/qib/qib_file_ops.c +++ b/drivers/infiniband/hw/qib/qib_file_ops.c | |||
@@ -351,9 +351,10 @@ static int qib_tid_update(struct qib_ctxtdata *rcd, struct file *fp, | |||
351 | * unless perhaps the user has mpin'ed the pages | 351 | * unless perhaps the user has mpin'ed the pages |
352 | * themselves. | 352 | * themselves. |
353 | */ | 353 | */ |
354 | qib_devinfo(dd->pcidev, | 354 | qib_devinfo( |
355 | "Failed to lock addr %p, %u pages: " | 355 | dd->pcidev, |
356 | "errno %d\n", (void *) vaddr, cnt, -ret); | 356 | "Failed to lock addr %p, %u pages: errno %d\n", |
357 | (void *) vaddr, cnt, -ret); | ||
357 | goto done; | 358 | goto done; |
358 | } | 359 | } |
359 | for (i = 0; i < cnt; i++, vaddr += PAGE_SIZE) { | 360 | for (i = 0; i < cnt; i++, vaddr += PAGE_SIZE) { |
@@ -951,8 +952,8 @@ static int mmap_kvaddr(struct vm_area_struct *vma, u64 pgaddr, | |||
951 | /* rcvegrbufs are read-only on the slave */ | 952 | /* rcvegrbufs are read-only on the slave */ |
952 | if (vma->vm_flags & VM_WRITE) { | 953 | if (vma->vm_flags & VM_WRITE) { |
953 | qib_devinfo(dd->pcidev, | 954 | qib_devinfo(dd->pcidev, |
954 | "Can't map eager buffers as " | 955 | "Can't map eager buffers as writable (flags=%lx)\n", |
955 | "writable (flags=%lx)\n", vma->vm_flags); | 956 | vma->vm_flags); |
956 | ret = -EPERM; | 957 | ret = -EPERM; |
957 | goto bail; | 958 | goto bail; |
958 | } | 959 | } |
@@ -1247,10 +1248,7 @@ static int init_subctxts(struct qib_devdata *dd, | |||
1247 | if (!qib_compatible_subctxts(uinfo->spu_userversion >> 16, | 1248 | if (!qib_compatible_subctxts(uinfo->spu_userversion >> 16, |
1248 | uinfo->spu_userversion & 0xffff)) { | 1249 | uinfo->spu_userversion & 0xffff)) { |
1249 | qib_devinfo(dd->pcidev, | 1250 | qib_devinfo(dd->pcidev, |
1250 | "Mismatched user version (%d.%d) and driver " | 1251 | "Mismatched user version (%d.%d) and driver version (%d.%d) while context sharing. Ensure that driver and library are from the same release.\n", |
1251 | "version (%d.%d) while context sharing. Ensure " | ||
1252 | "that driver and library are from the same " | ||
1253 | "release.\n", | ||
1254 | (int) (uinfo->spu_userversion >> 16), | 1252 | (int) (uinfo->spu_userversion >> 16), |
1255 | (int) (uinfo->spu_userversion & 0xffff), | 1253 | (int) (uinfo->spu_userversion & 0xffff), |
1256 | QIB_USER_SWMAJOR, QIB_USER_SWMINOR); | 1254 | QIB_USER_SWMAJOR, QIB_USER_SWMINOR); |