diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index f3545eb64aad..e5e7a4e8234c 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_mmap.c,v 1.84 2004/05/25 14:55:46 hannken Exp $	*/
+/*	$NetBSD: uvm_mmap.c,v 1.85 2004/12/02 15:23:47 briggs Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.84 2004/05/25 14:55:46 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.85 2004/12/02 15:23:47 briggs Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -935,6 +935,8 @@ sys_mlock(l, v, retval)
 
 	error = uvm_map_pageable(&p->p_vmspace->vm_map, addr, addr+size, FALSE,
 	    0);
+	if (error == EFAULT)
+		error = ENOMEM;
 	return error;
 }
 
@@ -984,6 +986,8 @@ sys_munlock(l, v, retval)
 
 	error = uvm_map_pageable(&p->p_vmspace->vm_map, addr, addr+size, TRUE,
 	    0);
+	if (error == EFAULT)
+		error = ENOMEM;
 	return error;
 }