diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /drivers/s390/cio/css.h | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/s390/cio/css.h')
| -rw-r--r-- | drivers/s390/cio/css.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h index 74a257b23383..e210f89a2449 100644 --- a/drivers/s390/cio/css.h +++ b/drivers/s390/cio/css.h | |||
| @@ -45,11 +45,11 @@ struct pgid { | |||
| 45 | union { | 45 | union { |
| 46 | __u8 fc; /* SPID function code */ | 46 | __u8 fc; /* SPID function code */ |
| 47 | struct path_state ps; /* SNID path state */ | 47 | struct path_state ps; /* SNID path state */ |
| 48 | } inf; | 48 | } __attribute__ ((packed)) inf; |
| 49 | union { | 49 | union { |
| 50 | __u32 cpu_addr : 16; /* CPU address */ | 50 | __u32 cpu_addr : 16; /* CPU address */ |
| 51 | struct extended_cssid ext_cssid; | 51 | struct extended_cssid ext_cssid; |
| 52 | } pgid_high; | 52 | } __attribute__ ((packed)) pgid_high; |
| 53 | __u32 cpu_id : 24; /* CPU identification */ | 53 | __u32 cpu_id : 24; /* CPU identification */ |
| 54 | __u32 cpu_model : 16; /* CPU model */ | 54 | __u32 cpu_model : 16; /* CPU model */ |
| 55 | __u32 tod_high; /* high word TOD clock */ | 55 | __u32 tod_high; /* high word TOD clock */ |