git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
scsi
/
megaraid.c
diff --git
a/drivers/scsi/megaraid.c
b/drivers/scsi/megaraid.c
index
de35ffe
..
7144674
100644
(file)
--- a/
drivers/scsi/megaraid.c
+++ b/
drivers/scsi/megaraid.c
@@
-45,7
+45,6
@@
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/init.h>
-#include <linux/dma-mapping.h>
#include <scsi/scsicam.h>
#include "scsi.h"
#include <scsi/scsicam.h>
#include "scsi.h"
@@
-2095,7
+2094,7
@@
make_local_pdev(adapter_t *adapter, struct pci_dev **pdev)
memcpy(*pdev, adapter->dev, sizeof(struct pci_dev));
memcpy(*pdev, adapter->dev, sizeof(struct pci_dev));
- if( pci_set_dma_mask(*pdev,
DMA_32BIT_MASK
) != 0 ) {
+ if( pci_set_dma_mask(*pdev,
0xffffffff
) != 0 ) {
kfree(*pdev);
return -1;
}
kfree(*pdev);
return -1;
}
@@
-4471,6
+4470,7
@@
mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
{
Scsi_Cmnd *scmd;
struct scsi_device *sdev;
{
Scsi_Cmnd *scmd;
struct scsi_device *sdev;
+ unsigned long flags = 0;
scb_t *scb;
int rval;
scb_t *scb;
int rval;
@@
-4859,10
+4859,10
@@
megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
/* Set the Mode of addressing to 64 bit if we can */
if ((adapter->flag & BOARD_64BIT) && (sizeof(dma_addr_t) == 8)) {
/* Set the Mode of addressing to 64 bit if we can */
if ((adapter->flag & BOARD_64BIT) && (sizeof(dma_addr_t) == 8)) {
- pci_set_dma_mask(pdev,
DMA_64BIT_MASK
);
+ pci_set_dma_mask(pdev,
0xffffffffffffffffULL
);
adapter->has_64bit_addr = 1;
} else {
adapter->has_64bit_addr = 1;
} else {
- pci_set_dma_mask(pdev,
DMA_32BIT_MASK
);
+ pci_set_dma_mask(pdev,
0xffffffff
);
adapter->has_64bit_addr = 0;
}
adapter->has_64bit_addr = 0;
}