[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20070322171703.GA22470@strauss.suse.de>
Date: Thu, 22 Mar 2007 18:17:03 +0100
From: Bernhard Walle <bwalle@...e.de>
To: linux-scsi@...r.kernel.org
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] Use unchecked_isa_dma in sd_revalidate_disk()
In sd_revalidate_disk(), the SCSI Disk driver needs a few bytes DMA memory,
allocated by kmalloc() and __GFP_DMA. This patch uses __GFP_DMA only if
the corresponding host structure has unchecked_isa_dma set.
Signed-off-by: Bernhard Walle <bwalle@...e.de>
---
drivers/scsi/sd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: linux-2.6.21-rc4/drivers/scsi/sd.c
===================================================================
--- linux-2.6.21-rc4.orig/drivers/scsi/sd.c
+++ linux-2.6.21-rc4/drivers/scsi/sd.c
@@ -1553,7 +1553,8 @@ static int sd_revalidate_disk(struct gen
if (!scsi_device_online(sdp))
goto out;
- buffer = kmalloc(SD_BUF_SIZE, GFP_KERNEL | __GFP_DMA);
+ buffer = kmalloc(SD_BUF_SIZE, GFP_KERNEL |
+ (sdp->host->unchecked_isa_dma ? __GFP_DMA : 0));
if (!buffer) {
printk(KERN_WARNING "(sd_revalidate_disk:) Memory allocation "
"failure.\n");
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists