diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-04 10:11:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-04 10:11:16 -0700 |
| commit | 8d00647f2cf0780497274a4b0ab0e66509579459 (patch) | |
| tree | b6f5171769896b69aa603d870f2b870c10703db9 /mm | |
| parent | 927498217c104aab27b81c785ce3a489491a8964 (diff) | |
| parent | 8c3ce5bece2e6e233c1d05b460883046d020fbf9 (diff) | |
| download | kernel-crypto-8d00647f2cf0780497274a4b0ab0e66509579459.tar.gz kernel-crypto-8d00647f2cf0780497274a4b0ab0e66509579459.tar.xz kernel-crypto-8d00647f2cf0780497274a4b0ab0e66509579459.zip | |
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.
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/rmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index 22ed3f71a67..b82146e6dfc 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -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; } - if (page_test_and_clear_dirty(page)) - ret = 1; return ret; } |