patch-2.3.15 linux/mm/memory.c

Next file: linux/mm/mlock.c
Previous file: linux/mm/filemap.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.14/linux/mm/memory.c linux/mm/memory.c
@@ -540,8 +540,10 @@
 		wait_on_page(map);
 	}
 	
-	if (++repeat < 16)
+	if (++repeat < 16) {
+		ptr = va & PAGE_MASK;
 		goto repeat;
+	}
 	return -EAGAIN;
 }
 
@@ -819,7 +821,6 @@
 		if (PageReserved(page))
 			++vma->vm_mm->rss;
 		copy_cow_page(old_page,new_page);
-		flush_page_to_ram(old_page);
 		flush_page_to_ram(new_page);
 		flush_cache_page(vma, address);
 		set_pte(page_table, pte_mkwrite(pte_mkdirty(mk_pte(new_page, vma->vm_page_prot))));

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)