Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

+10 -2
+8
drivers/s390/cio/device_status.c
··· 221 221 222 222 cdev_irb = &cdev->private->irb; 223 223 224 + /* 225 + * If the clear function had been performed, all formerly pending 226 + * status at the subchannel has been cleared and we must not pass 227 + * intermediate accumulated status to the device driver. 228 + */ 229 + if (irb->scsw.fctl & SCSW_FCTL_CLEAR_FUNC) 230 + memset(&cdev->private->irb, 0, sizeof(struct irb)); 231 + 224 232 /* Copy bits which are valid only for the start function. */ 225 233 if (irb->scsw.fctl & SCSW_FCTL_START_FUNC) { 226 234 /* Copy key. */
+2 -2
mm/rmap.c
··· 498 498 struct address_space *mapping = page_mapping(page); 499 499 if (mapping) 500 500 ret = page_mkclean_file(mapping, page); 501 + if (page_test_and_clear_dirty(page)) 502 + ret = 1; 501 503 } 502 - if (page_test_and_clear_dirty(page)) 503 - ret = 1; 504 504 505 505 return ret; 506 506 }