diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:01:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 14:01:26 -0700 |
| commit | 0d6ffdb8f151a2b685c7b45bde7ab2d49fc1bb00 (patch) | |
| tree | 1768c906e87750dc897a2f113e335886d9b906e8 /drivers/s390/block/dasd_eckd.h | |
| parent | Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing (diff) | |
| parent | [S390] dasd: tunable missing interrupt handler (diff) | |
| download | linux-dev-0d6ffdb8f151a2b685c7b45bde7ab2d49fc1bb00.tar.xz linux-dev-0d6ffdb8f151a2b685c7b45bde7ab2d49fc1bb00.zip | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] dasd: tunable missing interrupt handler
[S390] dasd: allocate fallback cqr for reserve/release
[S390] topology: use default MC domain initializer
[S390] initrd: change default load address
[S390] cmm, smsgiucv_app: convert sender to uppercase
[S390] cmm: add missing __init/__exit annotations
[S390] cio: use all available paths for some internal I/O
[S390] ccwreq: add ability to use all paths
[S390] cio: ccw_device_online_store return -EINVAL in case of missing driver
[S390] cio: Log the response from the unit check handler
[S390] cio: CHSC SIOSL Support
Diffstat (limited to 'drivers/s390/block/dasd_eckd.h')
| -rw-r--r-- | drivers/s390/block/dasd_eckd.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h index dd6385a5af14..0eb49655a6cd 100644 --- a/drivers/s390/block/dasd_eckd.h +++ b/drivers/s390/block/dasd_eckd.h @@ -320,7 +320,12 @@ struct dasd_gneq { __u8 identifier:2; __u8 reserved:6; } __attribute__ ((packed)) flags; - __u8 reserved[7]; + __u8 reserved[5]; + struct { + __u8 value:2; + __u8 number:6; + } __attribute__ ((packed)) timeout; + __u8 reserved3; __u16 subsystemID; __u8 reserved2[22]; } __attribute__ ((packed)); |