From: Dan Carpenter Date: Mon, 20 Jan 2014 10:32:49 +0000 (+0300) Subject: IB/usnic: Use GFP_ATOMIC under spinlock X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8ce96afa8239f13bdf5ab35839bac46c103bbedc;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git IB/usnic: Use GFP_ATOMIC under spinlock This is called from qp_grp_and_vf_bind() and we are holding the vf->lock so the allocation can't sleep. Fixes: e3cf00d0a87f ('IB/usnic: Add Cisco VIC low-level hardware driver') Signed-off-by: Dan Carpenter Signed-off-by: Roland Dreier --- diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index ae6934c0d05a..16755cdab2c0 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -498,7 +498,7 @@ int usnic_uiom_attach_dev_to_pd(struct usnic_uiom_pd *pd, struct device *dev) struct usnic_uiom_dev *uiom_dev; int err; - uiom_dev = kzalloc(sizeof(*uiom_dev), GFP_KERNEL); + uiom_dev = kzalloc(sizeof(*uiom_dev), GFP_ATOMIC); if (!uiom_dev) return -ENOMEM; uiom_dev->dev = dev;