X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fmemory.c;h=1002f473f497c37f34c5c33d4dfa7d2bd49faed0;hb=3196a88a8593748bad24824ef5eb8e5aa99698c9;hp=a472bcd4b061615504bce67bf93b28cfd723e044;hpb=b13ad6f47c172761a3ce06f0fd12d19118b3076c;p=linux-2.6

diff --git a/mm/memory.c b/mm/memory.c
index a472bcd4b0..1002f473f4 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1789,7 +1789,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * not dirty accountable.
 	 */
 	if (PageAnon(old_page)) {
-		if (!TestSetPageLocked(old_page)) {
+		if (trylock_page(old_page)) {
 			reuse = can_share_swap_page(old_page);
 			unlock_page(old_page);
 		}