summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Falcon <tlfalcon@linux.vnet.ibm.com>2016-10-17 15:28:09 -0500
committerDavid S. Miller <davem@davemloft.net>2016-10-18 14:17:13 -0400
commit12608c260d2fe36746508cb4fa20b6e9a5f9c241 (patch)
tree9c6291441f2718e60a8f30b2983d0a8087c6be8e
parent9fa2f2cca21b14d17b1c1a37babb639a48a5a29f (diff)
downloadlinux-stable-12608c260d2fe36746508cb4fa20b6e9a5f9c241.tar.gz
linux-stable-12608c260d2fe36746508cb4fa20b6e9a5f9c241.tar.bz2
linux-stable-12608c260d2fe36746508cb4fa20b6e9a5f9c241.zip
ibmvnic: Fix GFP_KERNEL allocation in interrupt context
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/ibm/ibmvnic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index bfe17d9c022d..928bf8a5a567 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1190,7 +1190,7 @@ static struct ibmvnic_sub_crq_queue *init_sub_crq_queue(struct ibmvnic_adapter
if (!scrq)
return NULL;
- scrq->msgs = (union sub_crq *)__get_free_pages(GFP_KERNEL, 2);
+ scrq->msgs = (union sub_crq *)__get_free_pages(GFP_ATOMIC, 2);
memset(scrq->msgs, 0, 4 * PAGE_SIZE);
if (!scrq->msgs) {
dev_warn(dev, "Couldn't allocate crq queue messages page\n");