From 3ac98a6f9099b0f2f61b1095d76995e0431ad9e5 Mon Sep 17 00:00:00 2001 From: Don Wood Date: Sat, 5 Sep 2009 20:36:37 -0700 Subject: [PATCH] --- yaml --- r: 157395 b: refs/heads/master c: ba0c5d9a8975cf740a4a4b8c579cc4b325f8b852 h: refs/heads/master i: 157393: 12064a8e212429e85ab978cf235f7270df1fdc1b 157391: 684a73f577b13909785008cef5ddc0678240e518 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes_utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e72407f10faf..2b637ab5f160 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 873fcdd4bfc75880888a7d148a71d70ed87c9ebf +refs/heads/master: ba0c5d9a8975cf740a4a4b8c579cc4b325f8b852 diff --git a/trunk/drivers/infiniband/hw/nes/nes_utils.c b/trunk/drivers/infiniband/hw/nes/nes_utils.c index a282031d15c7..b34072b04377 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_utils.c +++ b/trunk/drivers/infiniband/hw/nes/nes_utils.c @@ -548,7 +548,7 @@ struct nes_cqp_request *nes_get_cqp_request(struct nes_device *nesdev) spin_unlock_irqrestore(&nesdev->cqp.lock, flags); } if (cqp_request == NULL) { - cqp_request = kzalloc(sizeof(struct nes_cqp_request), GFP_KERNEL); + cqp_request = kzalloc(sizeof(struct nes_cqp_request), GFP_ATOMIC); if (cqp_request) { cqp_request->dynamic = 1; INIT_LIST_HEAD(&cqp_request->list);