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: (26 commits)
  IB/mlx4: Set ownership bit correctly when copying CQEs during CQ resize
  RDMA/nes: Remove tx_free_list
  RDMA/cma: Add IPv6 support
  RDMA/addr: Add support for translating IPv6 addresses
  mlx4_core: Delete incorrect comment
  mlx4_core: Add support for multiple completion event vectors
  IB/iser: Avoid recv buffer exhaustion caused by unexpected PDUs
  IB/ehca: Remove redundant test of vpage
  IB/ehca: Replace modulus operations in flush error completion path
  IB/ipath: Add locking for interrupt use of ipath_pd contexts vs free
  IB/ipath: Fix spi_pioindex value
  IB/ipath: Only do 1X workaround on rev1 chips
  IB/ipath: Don't count IB symbol and link errors unless link is UP
  IB/ipath: Check return value of dma_map_single()
  IB/ipath: Fix PSN of send WQEs after an RDMA read resend
  RDMA/nes: Cleanup warnings
  RDMA/nes: Add loopback check to make_cm_node()
  RDMA/nes: Check cqp_avail_reqs is empty after locking the list
  RDMA/nes: Fix TCP compliance test failures
  RDMA/nes: Forward packets for a new connection with stale APBVT entry
  ...

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index bec7e0249358..3b77b674cbf6 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -717,6 +717,7 @@ static int __devinit ehca_probe(struct of_device *dev,
         const u64 *handle;
         struct ib_pd *ibpd;
         int ret, i, eq_size;
+        unsigned long flags;
 
         handle = of_get_property(dev->node, "ibm,hca-handle", NULL);
         if (!handle) {
@@ -830,9 +831,9 @@ static int __devinit ehca_probe(struct of_device *dev,
                 ehca_err(&shca->ib_device,
                          "Cannot create device attributes  ret=%d", ret);
 
-        spin_lock(&shca_list_lock);
+        spin_lock_irqsave(&shca_list_lock, flags);
         list_add(&shca->shca_list, &shca_list);
-        spin_unlock(&shca_list_lock);
+        spin_unlock_irqrestore(&shca_list_lock, flags);
 
         return 0;
 
@@ -878,6 +879,7 @@ probe1:
 static int __devexit ehca_remove(struct of_device *dev)
 {
         struct ehca_shca *shca = dev->dev.driver_data;
+        unsigned long flags;
         int ret;
 
         sysfs_remove_group(&dev->dev.kobj, &ehca_dev_attr_grp);
@@ -915,9 +917,9 @@ static int __devexit ehca_remove(struct of_device *dev)
 
         ib_dealloc_device(&shca->ib_device);
 
-        spin_lock(&shca_list_lock);
+        spin_lock_irqsave(&shca_list_lock, flags);
         list_del(&shca->shca_list);
-        spin_unlock(&shca_list_lock);
+        spin_unlock_irqrestore(&shca_list_lock, flags);
 
         return ret;
 }
@@ -975,6 +977,7 @@ static int ehca_mem_notifier(struct notifier_block *nb,
                              unsigned long action, void *data)
 {
         static unsigned long ehca_dmem_warn_time;
+        unsigned long flags;
 
         switch (action) {
         case MEM_CANCEL_OFFLINE:
@@ -985,12 +988,12 @@ static int ehca_mem_notifier(struct notifier_block *nb,
         case MEM_GOING_ONLINE:
         case MEM_GOING_OFFLINE:
                 /* only ok if no hca is attached to the lpar */
-                spin_lock(&shca_list_lock);
+                spin_lock_irqsave(&shca_list_lock, flags);
                 if (list_empty(&shca_list)) {
-                        spin_unlock(&shca_list_lock);
+                        spin_unlock_irqrestore(&shca_list_lock, flags);
                         return NOTIFY_OK;
                 } else {
-                        spin_unlock(&shca_list_lock);
+                        spin_unlock_irqrestore(&shca_list_lock, flags);
                         if (printk_timed_ratelimit(&ehca_dmem_warn_time,
                                                    30 * 1000))
                                 ehca_gen_err("DMEM operations are not allowed"