Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / infiniband / hw / ipath / ipath_keys.c

diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/infiniband/hw/ipath/ipath_keys.c
index 85a4aefc6c03cbbb94f63af4eade1f92a36f91fe..c0e933fec2187d37c1d40b59f78ad4feea90c367 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_keys.c
+++ b/drivers/infiniband/hw/ipath/ipath_keys.c
@@ -128,11 +128,11 @@ int ipath_lkey_ok(struct ipath_qp *qp, struct ipath_sge *isge,
        int ret;
 
        /*
-        * We use LKEY == zero to mean a physical kmalloc() address.
-        * This is a bit of a hack since we rely on dma_map_single()
-        * being reversible by calling bus_to_virt().
+        * We use LKEY == zero for kernel virtual addresses
+        * (see ipath_get_dma_mr and ipath_dma.c).
         */
        if (sge->lkey == 0) {
+               /* always a kernel port, no locking needed */
                struct ipath_pd *pd = to_ipd(qp->ibqp.pd);
 
                if (pd->user) {
@@ -212,6 +212,7 @@ int ipath_rkey_ok(struct ipath_qp *qp, struct ipath_sge_state *ss,
         * (see ipath_get_dma_mr and ipath_dma.c).
         */
        if (rkey == 0) {
+               /* always a kernel port, no locking needed */
                struct ipath_pd *pd = to_ipd(qp->ibqp.pd);
 
                if (pd->user) {