cio: declare hardware structures packed.
Subsystems (2)
From: Peter Oberparleiter <[email protected]>
[S390] cio: declare hardware structures packed.
Signed-off-by Peter Oberparleiter <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
drivers/s390/cio/chsc.c | 16 ++++++++-------- drivers/s390/cio/chsc.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/s390/cio/chsc.c +8 -8
@@ -93,7 +93,7 @@ chsc_get_sch_desc_irq(struct subchannelu16 sch;/* subchannel */ u8 chpid[8 ];/* chpids 0-7 */ u16 fla[8 ];/* full link addresses 0-7 */ - } *ssd_area; + } __attribute__ ((packed)) *ssd_area; ssd_area = page;
@@ -444,7 +444,7 @@ __get_chpid_from_lir(void *data)u32 andesc[28 ];/* incident-specific information */ u32 isinfo[28 ]; - } *lir; + } __attribute__ ((packed)) *lir; lir = data;if (!(lir->iq&0x80 ))
@@ -483,7 +483,7 @@ chsc_process_crw(void)u32 reserved6;u32 ccdf[96 ];/* content-code dependent field */ /* ccdf has to be big enough for a link-incident record */ - } *sei_area; + } __attribute__ ((packed)) *sei_area;if (!sei_page)return 0 ;
@@ -1040,7 +1040,7 @@ __chsc_do_secm(struct channel_subsystem u32 :4 ; u32 fmt : 4; u32 :16 ; - } *secm_area; + } __attribute__ ((packed)) *secm_area;int ret, ccode; secm_area = page;
@@ -1251,7 +1251,7 @@ chsc_determine_channel_path_description(struct chsc_header response;u32 zeroes2;struct channel_path_desc desc; - } *scpd_area; + } __attribute__ ((packed)) *scpd_area; scpd_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!scpd_area)
@@ -1348,7 +1348,7 @@ chsc_get_channel_measurement_chars(struc u32 cmg : 8;u32 zeroes3;u32 data[NR_MEASUREMENT_CHARS ]; - } *scmc_area; + } __attribute__ ((packed)) *scmc_area; scmc_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!scmc_area)
@@ -1515,7 +1515,7 @@ chsc_enable_facility(int operation_code) u32 reserved5:4; u32 format2:4; u32 reserved6:24; - } *sda_area; + } __attribute__ ((packed)) *sda_area; sda_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!sda_area)
@@ -1567,7 +1567,7 @@ chsc_determine_css_characteristics(void)u32 reserved4;u32 general_char[510 ];u32 chsc_char[518 ]; - } *scsc_area; + } __attribute__ ((packed)) *scsc_area; scsc_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!scsc_area) {
drivers/s390/cio/chsc.h +4 -4
@@ -10,17 +10,17 @@struct chsc_header {u16 length;u16 code; -}; +} __attribute__ ((packed));#define NR_MEASUREMENT_CHARS 5struct cmg_chars {u32 values[NR_MEASUREMENT_CHARS ]; -}; +} __attribute__ ((packed));#define NR_MEASUREMENT_ENTRIES 8struct cmg_entry {u32 values[NR_MEASUREMENT_ENTRIES ]; -}; +} __attribute__ ((packed));struct channel_path_desc {u8 flags;
@@ -31,7 +31,7 @@ struct channel_path_desc {u8 zeroes;u8 chla;u8 chpp; -}; +} __attribute__ ((packed));struct channel_path {int id;