Skip to content

Commit

Permalink
[PATCH] IB/mthca: allow address handle creation in interrupt context
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Roland Dreier authored and Linus Torvalds committed Apr 16, 2005
1 parent 2a4443a commit 8df8a34
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/infiniband/hw/mthca/mthca_av.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/infiniband/hw/mthca/mthca_provider.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 8df8a34

Please sign in to comment.