diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
| commit | 2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch) | |
| tree | 63bc720c0ffe5f4760cac4ed617b9870b050175e /include/linux/page-flags.h | |
| parent | 504499f22c08a03e2e19dc88d31aa0ecd2ac815e (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/page-flags.h')
| -rw-r--r-- | include/linux/page-flags.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 6fa317801e1c..5f38c460367e 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h | |||
| @@ -310,7 +310,7 @@ static inline void SetPageUptodate(struct page *page) | |||
| 310 | { | 310 | { |
| 311 | #ifdef CONFIG_S390 | 311 | #ifdef CONFIG_S390 |
| 312 | if (!test_and_set_bit(PG_uptodate, &page->flags)) | 312 | if (!test_and_set_bit(PG_uptodate, &page->flags)) |
| 313 | page_clear_dirty(page); | 313 | page_clear_dirty(page, 0); |
| 314 | #else | 314 | #else |
| 315 | /* | 315 | /* |
| 316 | * Memory barrier must be issued before setting the PG_uptodate bit, | 316 | * Memory barrier must be issued before setting the PG_uptodate bit, |