Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] cio: Fix handling of interrupt for csch(). [S390] page_mkclean data corruption.
This commit is contained in:
commit
8d00647f2c
|
@ -221,6 +221,14 @@ ccw_device_accumulate_irb(struct ccw_device *cdev, struct irb *irb)
|
|||
|
||||
cdev_irb = &cdev->private->irb;
|
||||
|
||||
/*
|
||||
* If the clear function had been performed, all formerly pending
|
||||
* status at the subchannel has been cleared and we must not pass
|
||||
* intermediate accumulated status to the device driver.
|
||||
*/
|
||||
if (irb->scsw.fctl & SCSW_FCTL_CLEAR_FUNC)
|
||||
memset(&cdev->private->irb, 0, sizeof(struct irb));
|
||||
|
||||
/* Copy bits which are valid only for the start function. */
|
||||
if (irb->scsw.fctl & SCSW_FCTL_START_FUNC) {
|
||||
/* Copy key. */
|
||||
|
|
Loading…
Reference in a new issue