---

yaml --- r: 157395 b: refs/heads/master c: ba0c5d9 h: refs/heads/master i: 157393: 12064a8 157391: 684a73f v: v3
git-mirror · Sep 6, 2009 · 3ac98a6 · 3ac98a6
1 parent 35f797b
commit 3ac98a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);