lkml.org 
[lkml]   [2004]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
Date
From
Subject[PATCH] aic7xxx driver warning
Hi all,

These are two possible patches for the 2.6.10rc3. The patches correct a
compiler warning when CONFIG_HIGHMEM64G is not defined.

Both patches works well. "Opt1" is the Alan Cox way and "Opt2" is the
MaF way :-)

Cheers,
MaF
diff -r -u linux-2.6.10rc3/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c linux-2.6.10rc3-maf/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
--- linux-2.6.10rc3/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 2004-12-05 20:02:40.000000000 +0100
+++ linux-2.6.10rc3-maf/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 2004-12-10 21:21:57.000000000 +0100
@@ -226,7 +226,7 @@
}
pci_set_master(pdev);

- mask_39bit = 0x7FFFFFFFFFULL;
+ mask_39bit = (dma_addr_t)0x7FFFFFFFFFULL;
if (sizeof(dma_addr_t) > 4
&& ahc_linux_get_memsize() > 0x80000000
&& pci_set_dma_mask(pdev, mask_39bit) == 0) {diff -r -u linux-2.6.10rc3/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c linux-2.6.10rc3-maf/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
--- linux-2.6.10rc3/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 2004-12-05 20:02:40.000000000 +0100
+++ linux-2.6.10rc3-maf/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 2004-12-10 21:31:51.000000000 +0100
@@ -226,10 +226,10 @@
}
pci_set_master(pdev);

- mask_39bit = 0x7FFFFFFFFFULL;
if (sizeof(dma_addr_t) > 4
&& ahc_linux_get_memsize() > 0x80000000
&& pci_set_dma_mask(pdev, mask_39bit) == 0) {
+ mask_39bit = (dma_addr_t)0x7FFFFFFFFFULL;
ahc->flags |= AHC_39BIT_ADDRESSING;
ahc->platform_data->hw_dma_mask = mask_39bit;
} else {
\
 
 \ /
  Last update: 2005-03-22 14:08    [W:0.112 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site