Merge branch 'master' into gfs2

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/sparc64/mm/generic.c b/arch/sparc64/mm/generic.c
index 8cb06205d265..af9d81db0b38 100644
--- a/arch/sparc64/mm/generic.c
+++ b/arch/sparc64/mm/generic.c
@@ -69,6 +69,8 @@ static inline void io_remap_pte_range(struct mm_struct *mm, pte_t * pte,
                 } else
                         offset += PAGE_SIZE;
 
+                if (pte_write(entry))
+                        entry = pte_mkdirty(entry);
                 do {
                         BUG_ON(!pte_none(*pte));
                         set_pte_at(mm, address, pte, entry);