Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8df8a34d authored by Roland Dreier's avatar Roland Dreier Committed by Linus Torvalds
Browse files

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



Make address handle verbs usable from interrupt context.

Signed-off-by: default avatarRoland Dreier <roland@topspin.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2a4443a6

drivers/infiniband/hw/mthca/mthca_av.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/infiniband/hw/mthca/mthca_provider.c

+1 −1
Original line number Diff line number Diff line
@@ -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);