From a2605fabd46f4cfc2db02600a314247f7e272f86 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Fri, 31 Dec 2010 02:22:19 -0600
Subject: [PATCH] --- yaml --- r: 226886 b: refs/heads/master c:
 bc7accec8788ada4f459461194c2b8fad94ed239 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/scsi/be2iscsi/be_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0b9f297270b6..c5d458be7908 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df4da5cdfca05b37b366b9c69925b68586969c1c
+refs/heads/master: bc7accec8788ada4f459461194c2b8fad94ed239
diff --git a/trunk/drivers/scsi/be2iscsi/be_main.c b/trunk/drivers/scsi/be2iscsi/be_main.c
index 75a85aa9e882..be07ca06177e 100644
--- a/trunk/drivers/scsi/be2iscsi/be_main.c
+++ b/trunk/drivers/scsi/be2iscsi/be_main.c
@@ -3785,7 +3785,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
 	dma_addr_t paddr;
 
 	io_task->cmd_bhs = pci_pool_alloc(beiscsi_sess->bhs_pool,
-					  GFP_KERNEL, &paddr);
+					  GFP_ATOMIC, &paddr);
 	if (!io_task->cmd_bhs)
 		return -ENOMEM;
 	io_task->bhs_pa.u.a64.address = paddr;