[PATCH] Remove naked GFP_DMA from drivers/scsi/sd.c

This GFP_DMA can be GFP_KERNEL because sd_init_onedisk calls sd_spinup_disk
calls scsi_wait_req which can sleep.

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index ab2c022e717f5e1e7a63a07346d202a15ec3c7d0..a070bed5d7c74e107491300db144845ba462369b 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1197,7 +1197,7 @@ sd_init_onedisk(struct scsi_disk * sdkp, struct gendisk *disk)
                return;
        }
 
-       buffer = kmalloc(512, GFP_DMA);
+       buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
        if (!buffer) {
                printk(KERN_WARNING "(sd_init_onedisk:) Memory allocation "
                       "failure.\n");