patch-2.0.19 linux/mm/vmscan.c

Next file: linux/CREDITS
Previous file: linux/mm/mremap.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.18/linux/mm/vmscan.c linux/mm/vmscan.c
@@ -109,7 +109,7 @@
 			if (page_map->count != 1)
 				return 0;
 			if (!(entry = get_swap_page()))
-				return -1;	/* Aieee!!! Out of swap space! */
+				return 0;	/* Aieee!!! Out of swap space! */
 			vma->vm_mm->rss--;
 			flush_cache_page(vma, address);
 			set_pte(page_table, __pte(entry));
@@ -253,7 +253,7 @@
 	/*
 	 * Find the proper vm-area
 	 */
-	vma = find_vma(p, address);
+	vma = find_vma(p->mm, address);
 	if (!vma)
 		return 0;
 	if (address < vma->vm_start)
@@ -312,8 +312,6 @@
 		if (!--p->swap_cnt)
 			swap_task++;
 		switch (swap_out_process(p, dma, wait)) {
-			case -1:
-				return 0;
 			case 0:
 				if (p->swap_cnt)
 					swap_task++;


FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov