lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

Browse Source 
* '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:
Linus Torvalds
2007-04-04 10:11:16 -07:00
parent 927498217c 8c3ce5bece
commit 8d00647f2c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/s390/cio/device_status.c
View File

@@ -221,6 +221,14 @@ ccw_device_accumulate_irb(struct ccw_device *cdev, struct irb *irb)
cdev_irb = &cdev->private->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. */ /* Copy bits which are valid only for the start function. */
if (irb->scsw.fctl & SCSW_FCTL_START_FUNC) { if (irb->scsw.fctl & SCSW_FCTL_START_FUNC) {
/* Copy key. */ /* Copy key. */

4
mm/rmap.c
View File

@@ -498,9 +498,9 @@ int page_mkclean(struct page *page)
struct address_space *mapping = page_mapping(page); struct address_space *mapping = page_mapping(page);
if (mapping) if (mapping)
ret = page_mkclean_file(mapping, page); ret = page_mkclean_file(mapping, page);
if (page_test_and_clear_dirty(page))
ret = 1;
} }
if (page_test_and_clear_dirty(page))
ret = 1;
return ret; return ret;
} }