imported patch open-iscsi-gfpkernel.patch

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 6bb6aec84abe4100e5574909d351bd1a34210b09..128083b82e69780bc84072e7a5303c6292abe10b 100644 (file)
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -607,7 +607,7 @@ iscsi_if_send_reply(int pid, int seq, int type, int done, int multi,
        int flags = multi ? NLM_F_MULTI : 0;
        int t = done ? NLMSG_DONE : type;
 
-       skb = alloc_skb(len, GFP_ATOMIC);
+       skb = alloc_skb(len, GFP_KERNEL); /* not called from interrupt ctxt */
        if (!skb) {
                printk(KERN_ERR "Could not allocate skb to send reply.\n");
                return -ENOMEM;