diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
| commit | f3ffb6814408f29817fc84d40ecc9c796acaa3ab (patch) | |
| tree | b4702cbdbf2c4517a5986bbaa971495b0f92a877 /drivers/s390/cio/css.h | |
| parent | 5bafd76593f060540acbea3b61e3087e009aa269 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 */ |