From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klauser Date: Sun, 20 Mar 2005 13:22:21 +0000 Subject: [KJ] [UPDATE PATCH 18/19] drivers/scsi/qlogicfc: Use the DMA_{64, Message-Id: <20050320132221.GR3491@localhost.localdomain> MIME-Version: 1 Content-Type: multipart/mixed; boundary="===============63745115068219627==" List-Id: References: <20050220171244.GS14375@helium.tklauser.home> In-Reply-To: <20050220171244.GS14375@helium.tklauser.home> To: kernel-janitors@lists.osdl.org Cc: linux-scsi@vger.kernel.org --===============63745115068219627== Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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() This 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 --- linux-2.6.11.orig/drivers/scsi/qlogicfc.c 2005-03-02 12:50:38.000000000 +0100 +++ linux-2.6.11/drivers/scsi/qlogicfc.c 2005-03-20 13:27:54.000000000 +0100 @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include "scsi.h" @@ -719,8 +720,8 @@ int isp2x00_detect(Scsi_Host_Template * continue; /* Try to configure DMA attributes. */ - if (pci_set_dma_mask(pdev, 0xffffffffffffffffULL) && - pci_set_dma_mask(pdev, 0xffffffffULL)) + if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) && + pci_set_dma_mask(pdev, DMA_32BIT_MASK)) continue; host = scsi_register(tmpt, sizeof(struct isp2x00_hostdata)); --===============63745115068219627== Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ Kernel-janitors mailing list Kernel-janitors@lists.osdl.org http://lists.osdl.org/mailman/listinfo/kernel-janitors --===============63745115068219627==--