diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-17 14:28:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-17 14:28:53 -0800 |
| commit | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (patch) | |
| tree | bd43db7f86cd23af0c3905ff8ff991f910eba5e0 /drivers/infiniband/hw/ehca/ehca_sqp.c | |
| parent | 0bac038a9eec00ac27f95ca0360954c0016fd859 (diff) | |
| parent | ac8581d408d41ebd5583b4e85b18e7ef16bb044b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: Use consistent types for ehca_plpar_hcall9()
IB/ehca: Fix printk format warnings from u64 type change
IPoIB: Do not print error messages for multicast join retries
IB/mlx4: Fix memory ordering problem when posting LSO sends
mlx4_core: Fix min() warning
IPoIB: Fix deadlock between ipoib_open() and child interface create
IPoIB: Fix hang in napi_disable() if P_Key is never found
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_sqp.c')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_sqp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_sqp.c b/drivers/infiniband/hw/ehca/ehca_sqp.c index 706d97ad555..44447aaa550 100644 --- a/drivers/infiniband/hw/ehca/ehca_sqp.c +++ b/drivers/infiniband/hw/ehca/ehca_sqp.c @@ -85,7 +85,7 @@ u64 ehca_define_sqp(struct ehca_shca *shca, if (ret != H_SUCCESS) { ehca_err(&shca->ib_device, - "Can't define AQP1 for port %x. h_ret=%li", + "Can't define AQP1 for port %x. h_ret=%lli", port, ret); return ret; } |