From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klauser Subject: [UPDATE PATCH 19/19] drivers/scsi/sata_vsc: Use the DMA_32BIT_MASK constant Date: Sun, 20 Mar 2005 14:23:33 +0100 Message-ID: <20050320132333.GS3491@localhost.localdomain> References: <20050220171331.GT14375@helium.tklauser.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Received: from server3.hostpoint.ch ([217.26.52.13]:62223 "EHLO server3.hostpoint.ch") by vger.kernel.org with ESMTP id S262166AbVCTNXk (ORCPT ); Sun, 20 Mar 2005 08:23:40 -0500 Content-Disposition: inline In-Reply-To: <20050220171331.GT14375@helium.tklauser.home> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: kernel-janitors@lists.osdl.org Cc: jgarzik@pobox.com, linux-ide@vger.kernel.org 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/sata_vsc.c 2005-03-02 12:50:38.000000000 +0100 +++ linux-2.6.11/drivers/scsi/sata_vsc.c 2005-03-20 13:27:54.000000000 +0100 @@ -21,6 +21,7 @@ #include #include #include +#include #include "scsi.h" #include #include @@ -285,10 +286,10 @@ static int __devinit vsc_sata_init_one ( /* * Use 32 bit DMA mask, because 64 bit address support is poor. */ - rc = pci_set_dma_mask(pdev, 0xFFFFFFFFULL); + rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); if (rc) goto err_out_regions; - rc = pci_set_consistent_dma_mask(pdev, 0xFFFFFFFFULL); + rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); if (rc) goto err_out_regions;