diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 969717d5fcb8..3bfa23471a7f 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -43,7 +43,7 @@
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
  *	from:	i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp
  *		with some ideas from NetBSD's alpha pmap
- *	$Id: pmap.c,v 1.23 1999/05/11 18:59:56 dt Exp $
+ *	$Id: pmap.c,v 1.24 1999/05/28 05:38:47 alc Exp $
  */
 
 /*
@@ -970,7 +970,7 @@ pmap_new_proc(struct proc *p)
 
 	/* get a kernel virtual address for the UPAGES for this proc */
 	if ((up = p->p_addr) == NULL) {
-		up = (struct user *) kmem_alloc_pageable(kernel_map,
+		up = (struct user *) kmem_alloc_nofault(kernel_map,
 				UPAGES * PAGE_SIZE);
 #if !defined(MAX_PERF)
 		if (up == NULL)
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 4260c1c0ce3e..f9616515b609 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.237 1999/06/01 18:19:44 jlemon Exp $
+ *	$Id: pmap.c,v 1.238 1999/06/05 16:16:37 luoqi Exp $
  */
 
 /*
@@ -908,7 +908,7 @@ pmap_new_proc(p)
 
 	/* get a kernel virtual address for the UPAGES for this proc */
 	if ((up = p->p_addr) == NULL) {
-		up = (struct user *) kmem_alloc_pageable(kernel_map,
+		up = (struct user *) kmem_alloc_nofault(kernel_map,
 				UPAGES * PAGE_SIZE);
 #if !defined(MAX_PERF)
 		if (up == NULL)
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 4260c1c0ce3e..f9616515b609 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.237 1999/06/01 18:19:44 jlemon Exp $
+ *	$Id: pmap.c,v 1.238 1999/06/05 16:16:37 luoqi Exp $
  */
 
 /*
@@ -908,7 +908,7 @@ pmap_new_proc(p)
 
 	/* get a kernel virtual address for the UPAGES for this proc */
 	if ((up = p->p_addr) == NULL) {
-		up = (struct user *) kmem_alloc_pageable(kernel_map,
+		up = (struct user *) kmem_alloc_nofault(kernel_map,
 				UPAGES * PAGE_SIZE);
 #if !defined(MAX_PERF)
 		if (up == NULL)