From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klauser Subject: [UPDATE PATCH 06/19] drivers/scsi/aic7xxx/aic7xxx_osm: Use the DMA_32BIT_MASK constant Date: Sun, 20 Mar 2005 13:42:09 +0100 Message-ID: <20050320124209.GF3491@localhost.localdomain> References: <20050220170035.GG14375@helium.tklauser.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Received: from server3.hostpoint.ch ([217.26.52.13]:57874 "EHLO server3.hostpoint.ch") by vger.kernel.org with ESMTP id S261189AbVCTMmN (ORCPT ); Sun, 20 Mar 2005 07:42:13 -0500 Content-Disposition: inline In-Reply-To: <20050220170035.GG14375@helium.tklauser.home> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: kernel-janitors@lists.osdl.org Cc: linux-scsi@vger.kernel.org The previous patch did not compile cleanly on all architectures so here's a fixed one. Use the DMA_32BIT_MASK constant 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/aic7xxx/aic7xxx_osm.c 2005-03-02 12:50:36.000000000 +0100 +++ linux-2.6.11/drivers/scsi/aic7xxx/aic7xxx_osm.c 2005-03-20 13:27:54.000000000 +0100 @@ -138,6 +138,7 @@ #include /* For fetching system memory size */ #include /* For block_size() */ #include /* For ssleep/msleep */ +#include /* * Lock protecting manipulation of the ahc softc list. @@ -1361,7 +1362,7 @@ ahc_dmamem_alloc(struct ahc_softc *ahc, * our dma mask when doing allocations. */ if (ahc->dev_softc != NULL) - if (pci_set_dma_mask(ahc->dev_softc, 0xFFFFFFFF)) { + if (pci_set_dma_mask(ahc->dev_softc, DMA_32BIT_MASK)) { printk(KERN_WARNING "aic7xxx: No suitable DMA available.\n"); kfree(map); return (ENODEV);