2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index 3be3a13b5e30..e27eb8757650 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -373,7 +373,7 @@ int iser_send_data_out(struct iscsi_conn *conn,
         iser_dbg("%s itt %d dseg_len %d offset %d\n",
                  __func__,(int)itt,(int)data_seg_len,(int)buf_offset);
 
-        tx_desc = kmem_cache_zalloc(ig.desc_cache, GFP_NOIO);
+        tx_desc = kmem_cache_zalloc(ig.desc_cache, GFP_ATOMIC);
         if (tx_desc == NULL) {
                 iser_err("Failed to alloc desc for post dataout\n");
                 return -ENOMEM;
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 5e32e8f1edf5..fb88d6896b67 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -53,10 +53,10 @@ static int iser_start_rdma_unaligned_sg(struct iscsi_iser_task *iser_task,
         unsigned long  cmd_data_len = data->data_len;
 
         if (cmd_data_len > ISER_KMALLOC_THRESHOLD)
-                mem = (void *)__get_free_pages(GFP_NOIO,
+                mem = (void *)__get_free_pages(GFP_ATOMIC,
                       ilog2(roundup_pow_of_two(cmd_data_len)) - PAGE_SHIFT);
         else
-                mem = kmalloc(cmd_data_len, GFP_NOIO);
+                mem = kmalloc(cmd_data_len, GFP_ATOMIC);
 
         if (mem == NULL) {
                 iser_err("Failed to allocate mem size %d %d for copying sglist\n",