diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-20 11:20:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-20 11:20:47 +1000 |
| commit | a295523b31d81df1a1a205b9c72a2b1787d98041 (patch) | |
| tree | fac9be63142160dbbf7c65c994659c9cdba1da62 /include | |
| parent | 2d2c17562e631cf54d824303bce0370adcdc861a (diff) | |
| parent | 51ff0b67cbdc2f2851e2f33c43df89fbf3e54d54 (diff) | |
Merge remote branch 's390/features'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/pgtable.h | 2 | ||||
| -rw-r--r-- | include/linux/page-flags.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index e2bd73e8f9c0..9c7ea63729de 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -108,7 +108,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres #endif #ifndef __HAVE_ARCH_PAGE_CLEAR_DIRTY -#define page_clear_dirty(page) do { } while (0) +#define page_clear_dirty(page, mapped) do { } while (0) #endif #ifndef __HAVE_ARCH_PAGE_TEST_DIRTY 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) { #ifdef CONFIG_S390 if (!test_and_set_bit(PG_uptodate, &page->flags)) - page_clear_dirty(page); + page_clear_dirty(page, 0); #else /* * Memory barrier must be issued before setting the PG_uptodate bit, |