Sync in more uvm changes from NetBSD.

This time we're getting rid of KERN_* and VM_PAGER_* error codes and
use errnos instead.

2 files changed, 7 insertions, 11 deletions

diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index 3075bc124c4..57e61abfe98 100644
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.47 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.48 2001/11/28 13:47:39 art Exp $	*/
 /*	$NetBSD: pmap.c,v 1.1 1996/09/30 16:34:52 ws Exp $	*/
 
 /*
@@ -1275,7 +1275,7 @@ pmap_enter_c_pv(pm, va, pa, prot, flags, cacheable, pv)
 	 */
 	if (pte_insert(idx, &pte)) {
 		splx(s);
-		return (KERN_SUCCESS);
+		return (0);
 	}
 	
 	/*
@@ -1288,7 +1288,7 @@ pmap_enter_c_pv(pm, va, pa, prot, flags, cacheable, pv)
 	LIST_INSERT_HEAD(potable + idx, po, po_list);
 	splx(s);
 
-	return (KERN_SUCCESS);
+	return (0);
 }
 
 #define KERN_MAP_PV TRUE
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c
index 59fad7edbca..51d8d951118 100644
--- a/sys/arch/powerpc/powerpc/trap.c
+++ b/sys/arch/powerpc/powerpc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.38 2001/11/13 14:31:52 drahn Exp $	*/
+/*	$OpenBSD: trap.c,v 1.39 2001/11/28 13:47:39 art Exp $	*/
 /*	$NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $	*/
 
 /*
@@ -290,9 +290,7 @@ trap(frame)
 				ftype = VM_PROT_READ | VM_PROT_WRITE;
 			else
 				ftype = VM_PROT_READ;
-			if (uvm_fault(map, trunc_page(va), 0, ftype)
-			    == KERN_SUCCESS)
-			{
+			if (uvm_fault(map, trunc_page(va), 0, ftype) == 0) {
 				return;
 			}
 			if ((fb = p->p_addr->u_pcb.pcb_onfault)) {
@@ -318,8 +316,7 @@ printf("kern dsi on addr %x iar %x\n", frame->dar, frame->srr0);
 			} else
 				vftype = ftype = VM_PROT_READ;
 			if (uvm_fault(&p->p_vmspace->vm_map,
-				     trunc_page(frame->dar), 0, ftype)
-			    == KERN_SUCCESS) {
+				     trunc_page(frame->dar), 0, ftype) == 0) {
 				break;
 			}
 #if 0
@@ -338,8 +335,7 @@ printf("dsi on addr %x iar %x lr %x\n", frame->dar, frame->srr0,frame->lr);
 			
 			ftype = VM_PROT_READ | VM_PROT_EXECUTE;
 			if (uvm_fault(&p->p_vmspace->vm_map,
-				     trunc_page(frame->srr0), 0, ftype)
-			    == KERN_SUCCESS) {
+				     trunc_page(frame->srr0), 0, ftype)) {
 				break;
 			}
 		}