[PATCH] IB/mthca: allow address handle creation in interrupt context

Make address handle verbs usable from interrupt context.

Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c
index 426d32778e9c..e4ee5d024dfb 100644
--- a/drivers/infiniband/hw/mthca/mthca_av.c
+++ b/drivers/infiniband/hw/mthca/mthca_av.c
@@ -63,7 +63,7 @@ int mthca_create_ah(struct mthca_dev *dev,
         ah->type = MTHCA_AH_PCI_POOL;
 
         if (dev->hca_type == ARBEL_NATIVE) {
-                ah->av   = kmalloc(sizeof *ah->av, GFP_KERNEL);
+                ah->av   = kmalloc(sizeof *ah->av, GFP_ATOMIC);
                 if (!ah->av)
                         return -ENOMEM;
 
@@ -77,7 +77,7 @@ int mthca_create_ah(struct mthca_dev *dev,
                 if (index == -1)
                         goto on_hca_fail;
 
-                av = kmalloc(sizeof *av, GFP_KERNEL);
+                av = kmalloc(sizeof *av, GFP_ATOMIC);
                 if (!av)
                         goto on_hca_fail;
 
@@ -89,7 +89,7 @@ int mthca_create_ah(struct mthca_dev *dev,
 on_hca_fail:
         if (ah->type == MTHCA_AH_PCI_POOL) {
                 ah->av = pci_pool_alloc(dev->av_table.pool,
-                                        SLAB_KERNEL, &ah->avdma);
+                                        SLAB_ATOMIC, &ah->avdma);
                 if (!ah->av)
                         return -ENOMEM;
 
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 55a338da9970..daa54db00aa9 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -315,7 +315,7 @@ static struct ib_ah *mthca_ah_create(struct ib_pd *pd,
         int err;
         struct mthca_ah *ah;
 
-        ah = kmalloc(sizeof *ah, GFP_KERNEL);
+        ah = kmalloc(sizeof *ah, GFP_ATOMIC);
         if (!ah)
                 return ERR_PTR(-ENOMEM);