tree 6eaf6227e3210dee5f4f59b616a3d322234d5963
parent c9c80dc24992c59725dd68728bb11dcbc385d592
author Roland Dreier <[EMAIL PROTECTED]> Tue Apr 12 08:26:52 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:52 2005

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

Make address handle verbs usable from interrupt context.

Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 mthca_av.c       |    6 +++---
 mthca_provider.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: drivers/infiniband/hw/mthca/mthca_av.c
===================================================================
--- 
7c29f6013d76eb7226bdc648b35524f532342452/drivers/infiniband/hw/mthca/mthca_av.c 
 (mode:100644 sha1:93e34aae37c910ea8f728e0ff3cb565521e6ff7e)
+++ 
6eaf6227e3210dee5f4f59b616a3d322234d5963/drivers/infiniband/hw/mthca/mthca_av.c 
 (mode:100644 sha1:96775eb5ed9851274468a33bbeb3c607aecb10c4)
@@ -63,7 +63,7 @@
        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 @@
                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 @@
 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;
 
Index: drivers/infiniband/hw/mthca/mthca_provider.c
===================================================================
--- 
7c29f6013d76eb7226bdc648b35524f532342452/drivers/infiniband/hw/mthca/mthca_provider.c
  (mode:100644 sha1:ff8d2cd92012f6949c17a44af2f9190addc2e6b3)
+++ 
6eaf6227e3210dee5f4f59b616a3d322234d5963/drivers/infiniband/hw/mthca/mthca_provider.c
  (mode:100644 sha1:c371ba0adc24a1177e0804c83649a10432568fef)
@@ -315,7 +315,7 @@
        int err;
        struct mthca_ah *ah;
 
-       ah = kmalloc(sizeof *ah, GFP_KERNEL);
+       ah = kmalloc(sizeof *ah, GFP_ATOMIC);
        if (!ah)
                return ERR_PTR(-ENOMEM);
 
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to