diff options
Diffstat (limited to 'drivers/s390/block/dasd_diag.h')
-rw-r--r-- | drivers/s390/block/dasd_diag.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h index b26eb28df4bf..df31484d73a7 100644 --- a/drivers/s390/block/dasd_diag.h +++ b/drivers/s390/block/dasd_diag.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * Bugreports.to..: <Linux390@de.ibm.com> | 6 | * Bugreports.to..: <Linux390@de.ibm.com> |
7 | * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 | 7 | * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 |
8 | * | 8 | * |
9 | * $Revision: 1.7 $ | 9 | * $Revision: 1.8 $ |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #define MDSK_WRITE_REQ 0x01 | 12 | #define MDSK_WRITE_REQ 0x01 |
@@ -78,7 +78,7 @@ struct dasd_diag_bio { | |||
78 | u8 spare1[2]; | 78 | u8 spare1[2]; |
79 | u32 alet; | 79 | u32 alet; |
80 | blocknum_t block_number; | 80 | blocknum_t block_number; |
81 | u64 buffer; | 81 | void *buffer; |
82 | } __attribute__ ((packed, aligned(8))); | 82 | } __attribute__ ((packed, aligned(8))); |
83 | 83 | ||
84 | struct dasd_diag_init_io { | 84 | struct dasd_diag_init_io { |
@@ -104,7 +104,7 @@ struct dasd_diag_rw_io { | |||
104 | u32 alet; | 104 | u32 alet; |
105 | u8 spare3[4]; | 105 | u8 spare3[4]; |
106 | u64 interrupt_params; | 106 | u64 interrupt_params; |
107 | u64 bio_list; | 107 | struct dasd_diag_bio *bio_list; |
108 | u8 spare4[8]; | 108 | u8 spare4[8]; |
109 | } __attribute__ ((packed, aligned(8))); | 109 | } __attribute__ ((packed, aligned(8))); |
110 | #else /* CONFIG_ARCH_S390X */ | 110 | #else /* CONFIG_ARCH_S390X */ |
@@ -119,7 +119,7 @@ struct dasd_diag_bio { | |||
119 | u16 spare1; | 119 | u16 spare1; |
120 | blocknum_t block_number; | 120 | blocknum_t block_number; |
121 | u32 alet; | 121 | u32 alet; |
122 | u32 buffer; | 122 | void *buffer; |
123 | } __attribute__ ((packed, aligned(8))); | 123 | } __attribute__ ((packed, aligned(8))); |
124 | 124 | ||
125 | struct dasd_diag_init_io { | 125 | struct dasd_diag_init_io { |
@@ -142,7 +142,7 @@ struct dasd_diag_rw_io { | |||
142 | u8 spare2[2]; | 142 | u8 spare2[2]; |
143 | u32 block_count; | 143 | u32 block_count; |
144 | u32 alet; | 144 | u32 alet; |
145 | u32 bio_list; | 145 | struct dasd_diag_bio *bio_list; |
146 | u32 interrupt_params; | 146 | u32 interrupt_params; |
147 | u8 spare3[20]; | 147 | u8 spare3[20]; |
148 | } __attribute__ ((packed, aligned(8))); | 148 | } __attribute__ ((packed, aligned(8))); |