drivers/block/cciss.c: Use the DMA_{64,
Subsystems (2)
PATCH 1/3 drivers/block/cciss.c: Use the DMA_{64,
The previous patch did not compile cleanly on all architectures so here's a fixed one.
Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
Thise patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details
Signed-off-by Tobias Klauser <[email protected]>
drivers/block/cciss.c +3 -2
@@ -38,6 +38,7 @@#include <linux/hdreg.h> #include <linux/spinlock.h> #include <linux/compat.h> +#include <linux/dma-mapping.h> #include <asm/uaccess.h> #include <asm/io.h>
@@ -2692,9 +2693,9 @@ static int __devinit cciss_init_one(stru hba[i]->pdev = pdev;/* configure PCI DMA stuff */ -if (!pci_set_dma_mask (pdev,0xffffffffffffffffULL )) +if (!pci_set_dma_mask (pdev,DMA_64BIT_MASK ))printk ("cciss: using DAC cycles\n" ); -else if (!pci_set_dma_mask (pdev,0xffffffff )) +else if (!pci_set_dma_mask (pdev,DMA_32BIT_MASK ))printk ("cciss: not using DAC cycles\n" );else {printk ("cciss: no suitable DMA available\n" );
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors