aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message
diff options
context:
space:
mode:
authorSatyam Sharma <ssatyam@cse.iitk.ac.in>2007-07-09 15:00:07 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-07-15 10:33:34 -0400
commita3f249a242e804b61a14518ec9d5ec8ee48720d7 (patch)
tree40a3d3e696acbd68c08d108ee1a32f80cf29661c /drivers/message
parent3021c710cbf87c4ac528b737908d0c0669e8098e (diff)
[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>
Diffstat (limited to 'drivers/message')
-rw-r--r--drivers/message/i2o/device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index b9df143e4ff1..611adc3c0f74 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,
485 u8 *resblk; /* 8 bytes for header */ 485 u8 *resblk; /* 8 bytes for header */
486 int rc; 486 int rc;
487 487
488 resblk = kmalloc(buflen + 8, GFP_KERNEL | GFP_ATOMIC); 488 resblk = kmalloc(buflen + 8, GFP_KERNEL);
489 if (!resblk) 489 if (!resblk)
490 return -ENOMEM; 490 return -ENOMEM;
491 491