From f1ae49aa536c04b7775aaea56cfab92c6f4b337e Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Mon, 21 Sep 2009 17:03:29 -0700 Subject: [PATCH] --- yaml --- r: 164471 b: refs/heads/master c: 1ac0cb5d0e22d5e483f56b2bc12172dec1cf7536 h: refs/heads/master i: 164469: db04a9e19fac3dc774640d29e364c577c7768e40 164467: adf33090738f3facc6715135300d0737c84c094f 164463: f773c7b09644361ae94cd787ca9512203f6cc598 v: v3 --- [refs] | 2 +- trunk/mm/memory.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a37847378e9..993df4a000b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a15efc953b26ad57d7d38b9e6782d57e53b4ab2 +refs/heads/master: 1ac0cb5d0e22d5e483f56b2bc12172dec1cf7536 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 6359a4f80c4a..fc38d4ed9ad9 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -2653,7 +2653,8 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, goto oom_free_page; entry = mk_pte(page, vma->vm_page_prot); - entry = maybe_mkwrite(pte_mkdirty(entry), vma); + if (vma->vm_flags & VM_WRITE) + entry = pte_mkwrite(pte_mkdirty(entry)); page_table = pte_offset_map_lock(mm, pmd, address, &ptl); if (!pte_none(*page_table))