From: Satyam Sharma <ssatyam@cse.iitk.ac.in>
Date: Mon, 9 Jul 2007 19:00:07 +0000 (-0700)
Subject: [SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c
X-Git-Tag: v2.6.23-rc1~1053^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a3f249a242e804b61a14518ec9d5ec8ee48720d7;p=linux-2.6-omap-h63xx.git

[SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c

drivers/message/i2o/device.c:i2o_parm_field_get() unnecessarily passes
GFP_ATOMIC (along with GFP_KERNEL) to kmalloc() from a context that is not
atomic. Remove the pointless GFP_ATOMIC.

Signed-off-by: Satyam Sharma <ssatyam@cse.iitk.ac.in>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index b9df143e4ff..611adc3c0f7 100644
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -485,7 +485,7 @@ int i2o_parm_field_get(struct i2o_device *i2o_dev, int group, int field,
 	u8 *resblk;		/* 8 bytes for header */
 	int rc;
 
-	resblk = kmalloc(buflen + 8, GFP_KERNEL | GFP_ATOMIC);
+	resblk = kmalloc(buflen + 8, GFP_KERNEL);
 	if (!resblk)
 		return -ENOMEM;