summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid/aacraid.h
diff options
context:
space:
mode:
authorBen Collins2012-06-11 20:05:02 +0200
committerJames Bottomley2012-07-20 09:58:43 +0200
commitff08784b41e1ab5da6776411b7a8381fe942f2cc (patch)
tree0f26c0cbd909089ccca01ba3516040eb771ad552 /drivers/scsi/aacraid/aacraid.h
parent[SCSI] scsi_dh: add scsi_dh_attached_handler_name (diff)
downloadkernel-qcow2-linux-ff08784b41e1ab5da6776411b7a8381fe942f2cc.tar.gz
kernel-qcow2-linux-ff08784b41e1ab5da6776411b7a8381fe942f2cc.tar.xz
kernel-qcow2-linux-ff08784b41e1ab5da6776411b7a8381fe942f2cc.zip
[SCSI] aacraid: Use resource_size_t for IO mem pointers and offsets
This also stops using the "legacy crap" in Scsi_Host (shost->base is an unsigned long). This affected 32-bit systems that have 64-bit resource sizes, causing the IO address to be truncated. Signed-off-by: Ben Collins <bcollins@ubuntu.com> Acked-by: Achim Leubner <Achim_Leubner@pmc-sierra.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/aacraid/aacraid.h')
-rw-r--r--drivers/scsi/aacraid/aacraid.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 3fcf62724fad..6ab32db73bb6 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1052,10 +1052,11 @@ struct aac_dev
struct adapter_ops a_ops;
unsigned long fsrev; /* Main driver's revision number */
- unsigned long dbg_base; /* address of UART
+ resource_size_t base_start; /* main IO base */
+ resource_size_t dbg_base; /* address of UART
* debug buffer */
- unsigned base_size, dbg_size; /* Size of
+ resource_size_t base_size, dbg_size; /* Size of
* mapped in region */
struct aac_init *init; /* Holds initialization info to communicate with adapter */