diff --git a/[refs] b/[refs] index 323baf5ea482..b84f92074db4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08ef472937e918875a82fd350d3de138aac50414 +refs/heads/master: d296e9cd02c92e576ecce5344026a4df4353cdb2 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index b8846cf2358a..1c0a3db78a05 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -1239,7 +1239,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct * vma, } old_page = pfn_to_page(pfn); - if (!TestSetPageLocked(old_page)) { + if (PageAnon(old_page) && !TestSetPageLocked(old_page)) { int reuse = can_share_swap_page(old_page); unlock_page(old_page); if (reuse) {