Merge branch 'linus' into perfcounters/core

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

diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c
index be4fc9ada8e7f1e872b740686a74404ae53525fc..17a123197477324bb78f6fc10b42f444b6cabbcb 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_mad.c
+++ b/drivers/infiniband/hw/ipath/ipath_mad.c
@@ -348,6 +348,7 @@ bail:
  */
 static int get_pkeys(struct ipath_devdata *dd, u16 * pkeys)
 {
+       /* always a kernel port, no locking needed */
        struct ipath_portdata *pd = dd->ipath_pd[0];
 
        memcpy(pkeys, pd->port_pkeys, sizeof(pd->port_pkeys));
@@ -730,6 +731,7 @@ static int set_pkeys(struct ipath_devdata *dd, u16 *pkeys)
        int i;
        int changed = 0;
 
+       /* always a kernel port, no locking needed */
        pd = dd->ipath_pd[0];
 
        for (i = 0; i < ARRAY_SIZE(pd->port_pkeys); i++) {