Commit 8d00647f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 92749821 8c3ce5be

drivers/s390/cio/device_status.c

+8 −0
Original line number Diff line number Diff line
@@ -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. */

mm/rmap.c

+2 −2
Original line number Diff line number Diff line
@@ -498,9 +498,9 @@ int page_mkclean(struct page *page) 
		struct address_space *mapping = page_mapping(page);

		if (mapping)

			ret = page_mkclean_file(mapping, page);

	}

		if (page_test_and_clear_dirty(page))

			ret = 1;

	}



	return ret;

}