diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-16 13:23:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-16 13:23:45 -0800 |
| commit | c7ef259bfb4084d8806dfff9eb8bfc6e82bb8c45 (patch) | |
| tree | aa910b2c8a8dd7f80b6fe13c9a206136ddc078fc /include | |
| parent | 99f5e9718185f07458ae70c2282c2153a2256c91 (diff) | |
| parent | 0b0df6f2079e731c44226a0673b07a166509a5de (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/mthca: Use DEFINE_MUTEX() instead of mutex_init()
IB/mthca: Add HCA profile module parameters
IB/srp: Fix FMR mapping for 32-bit kernels and addresses above 4G
IB: Fix ib_dma_alloc_coherent() wrapper
Diffstat (limited to 'include')
| -rw-r--r-- | include/rdma/ib_verbs.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 3c2e10574b23..0bfa3328d686 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1639,7 +1639,14 @@ static inline void *ib_dma_alloc_coherent(struct ib_device *dev, { if (dev->dma_ops) return dev->dma_ops->alloc_coherent(dev, size, dma_handle, flag); - return dma_alloc_coherent(dev->dma_device, size, dma_handle, flag); + else { + dma_addr_t handle; + void *ret; + + ret = dma_alloc_coherent(dev->dma_device, size, &handle, flag); + *dma_handle = handle; + return ret; + } } /** |