diff options
| author | Jeff Garzik | 2006-06-08 21:24:46 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2006-06-08 21:24:46 +0200 |
| commit | d15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch) | |
| tree | d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /drivers/s390 | |
| parent | Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux... (diff) | |
| parent | Linux 2.6.17-rc6 (diff) | |
| download | kernel-qcow2-linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.tar.gz kernel-qcow2-linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.tar.xz kernel-qcow2-linux-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/cio/css.h | 4 | ||||
| -rw-r--r-- | drivers/s390/cio/device_fsm.c | 2 |
2 files changed, 3 insertions, 3 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 { union { __u8 fc; /* SPID function code */ struct path_state ps; /* SNID path state */ - } inf; + } __attribute__ ((packed)) inf; union { __u32 cpu_addr : 16; /* CPU address */ struct extended_cssid ext_cssid; - } pgid_high; + } __attribute__ ((packed)) pgid_high; __u32 cpu_id : 24; /* CPU identification */ __u32 cpu_model : 16; /* CPU model */ __u32 tod_high; /* high word TOD clock */ diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 180b3bf8b90d..49ec562d7f60 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c @@ -749,7 +749,7 @@ ccw_device_irq(struct ccw_device *cdev, enum dev_event dev_event) /* Unit check but no sense data. Need basic sense. */ if (ccw_device_do_sense(cdev, irb) != 0) goto call_handler_unsol; - memcpy(irb, &cdev->private->irb, sizeof(struct irb)); + memcpy(&cdev->private->irb, irb, sizeof(struct irb)); cdev->private->state = DEV_STATE_W4SENSE; cdev->private->intparm = 0; return; |