provide md USPACE_ALIGN zero on all but mips; deradat@ pefo@ ok

13 files changed, 26 insertions, 15 deletions

diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h
index 5efd651be8b..6e4ecb34834 100644
--- a/sys/arch/alpha/include/param.h
+++ b/sys/arch/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.24 2004/04/19 22:55:45 deraadt Exp $ */
+/* $OpenBSD: param.h,v 1.25 2004/08/06 22:31:30 mickey Exp $ */
 /* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */
 
 /*
@@ -89,6 +89,7 @@
 
 #define	UPAGES		2			/* pages of u-area */
 #define	USPACE		(UPAGES * NBPG)		/* total size of u-area */
+#define	USPACE_ALIGN	(0)			/* u-area alignment 0-none */
 
 #ifndef MSGBUFSIZE
 #define MSGBUFSIZE	NBPG		/* default message buffer size */
diff --git a/sys/arch/amd64/include/param.h b/sys/arch/amd64/include/param.h
index 09e070357a6..02417bc4aea 100644
--- a/sys/arch/amd64/include/param.h
+++ b/sys/arch/amd64/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.4 2004/06/13 21:49:13 niklas Exp $	*/
+/*	$OpenBSD: param.h,v 1.5 2004/08/06 22:31:30 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -98,6 +98,7 @@
 #define	SINCR		1		/* increment of stack/NBPG */
 #define	UPAGES		5		/* pages of u-area */
 #define	USPACE		(UPAGES * NBPG)	/* total size of u-area */
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 #ifndef MSGBUFSIZE
 #define MSGBUFSIZE	4*NBPG		/* default message buffer size */
diff --git a/sys/arch/arm/include/param.h b/sys/arch/arm/include/param.h
index e8eed68c94f..ccdfc4507ea 100644
--- a/sys/arch/arm/include/param.h
+++ b/sys/arch/arm/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.4 2004/05/19 03:17:07 drahn Exp $	*/
+/*	$OpenBSD: param.h,v 1.5 2004/08/06 22:31:30 mickey Exp $	*/
 /*	$NetBSD: param.h,v 1.9 2002/03/24 03:37:23 thorpej Exp $	*/
 
 /*
@@ -57,6 +57,7 @@
 #define SINCR           1               /* increment of stack/NBPG */
 #define UPAGES          2               /* pages of u-area */
 #define USPACE          (UPAGES * PAGE_SIZE) /* total size of u-area */
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 #ifndef MSGBUFSIZE
 #define MSGBUFSIZE	PAGE_SIZE	/* default message buffer size */
diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h
index af7750571d0..0b8b1ab600c 100644
--- a/sys/arch/hppa/include/param.h
+++ b/sys/arch/hppa/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.23 2004/06/28 14:36:59 mickey Exp $	*/
+/*	$OpenBSD: param.h,v 1.24 2004/08/06 22:31:30 mickey Exp $	*/
 
 /* 
  * Copyright (c) 1988-1994, The University of Utah and
@@ -67,6 +67,7 @@
 #define	SINCR		(1)		/* increment of stack/NBPG */
 
 #define	USPACE		(4 * NBPG)	/* pages for user struct and kstack */
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 #ifndef	MSGBUFSIZE
 #define	MSGBUFSIZE	2*NBPG		/* default message buffer size */
diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h
index 335d7737cbb..fdb1ffd2bb8 100644
--- a/sys/arch/i386/include/param.h
+++ b/sys/arch/i386/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.28 2004/06/13 21:49:16 niklas Exp $	*/
+/*	$OpenBSD: param.h,v 1.29 2004/08/06 22:31:31 mickey Exp $	*/
 /*	$NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $	*/
 
 /*-
@@ -97,6 +97,7 @@
 #define	SINCR		1		/* increment of stack/NBPG */
 #define	UPAGES		2		/* pages of u-area */
 #define	USPACE		(UPAGES * NBPG)	/* total size of u-area */
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 #ifndef MSGBUFSIZE
 #define MSGBUFSIZE	4*NBPG		/* default message buffer size */
diff --git a/sys/arch/m68k/include/param.h b/sys/arch/m68k/include/param.h
index 8610fb2a3bd..ca3f111cc77 100644
--- a/sys/arch/m68k/include/param.h
+++ b/sys/arch/m68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.9 2004/04/19 23:29:03 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.10 2004/08/06 22:31:31 mickey Exp $	*/
 /*	$NetBSD: param.h,v 1.2 1997/06/10 18:21:23 veego Exp $	*/
 
 /*
@@ -92,6 +92,7 @@
 #define UPAGES		2		/* pages of u-area */
 #endif
 #define	USPACE		(UPAGES * NBPG)
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 /*
  * Constants related to network buffer management.
diff --git a/sys/arch/m88k/include/param.h b/sys/arch/m88k/include/param.h
index 3f50cab54b2..edb77b749c0 100644
--- a/sys/arch/m88k/include/param.h
+++ b/sys/arch/m88k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.1 2004/04/26 12:34:05 miod Exp $ */
+/*	$OpenBSD: param.h,v 1.2 2004/08/06 22:31:31 mickey Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1988 University of Utah.
@@ -82,6 +82,7 @@
 
 #define UPAGES		3		/* pages of u-area */
 #define USPACE		(UPAGES * NBPG)
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 #define UADDR		0xeee00000	/* address of u */
 
diff --git a/sys/arch/mips64/include/param.h b/sys/arch/mips64/include/param.h
index 4af7c8c2944..ead77486827 100644
--- a/sys/arch/mips64/include/param.h
+++ b/sys/arch/mips64/include/param.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: param.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */
+/*      $OpenBSD: param.h,v 1.2 2004/08/06 22:31:31 mickey Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -105,7 +105,7 @@
 #endif
 
 #define USPACE		(UPAGES*NBPG)	/* size of u-area in bytes */
-#define	USPACE_ALIGN	(2*NBPG)
+#define	USPACE_ALIGN	(2*NBPG)	/* u-area alignment 0-none */
 
 #define PMAP_NEW
 
diff --git a/sys/arch/powerpc/include/param.h b/sys/arch/powerpc/include/param.h
index 30f2d7edd40..75c62bc7a40 100644
--- a/sys/arch/powerpc/include/param.h
+++ b/sys/arch/powerpc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.24 2004/06/24 22:35:56 drahn Exp $	*/
+/*	$OpenBSD: param.h,v 1.25 2004/08/06 22:31:31 mickey Exp $	*/
 /*	$NetBSD: param.h,v 1.1 1996/09/30 16:34:28 ws Exp $	*/
 
 /*-
@@ -67,6 +67,7 @@
 
 #define	UPAGES		4
 #define	USPACE		(UPAGES * NBPG)
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 /*
  * Constants related to network buffer management.
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h
index c214645ae74..744a9a480b0 100644
--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.28 2004/04/19 22:55:50 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.29 2004/08/06 22:31:31 mickey Exp $	*/
 /*	$NetBSD: param.h,v 1.29 1997/03/10 22:50:37 pk Exp $ */
 
 /*
@@ -89,6 +89,7 @@
 
 #define	SSIZE		1		/* initial stack size in pages */
 #define	USPACE		8192
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 /*
  * Constants related to network buffer management.
diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h
index 3de7a4c6d42..f77b3241f2e 100644
--- a/sys/arch/sparc64/include/param.h
+++ b/sys/arch/sparc64/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.13 2004/04/19 22:55:50 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.14 2004/08/06 22:31:31 mickey Exp $	*/
 /*	$NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */
 
 /*
@@ -114,6 +114,7 @@ extern int nbpg, pgofset, pgshift;
 /* We get stack overflows w/8K stacks in 64-bit mode */
 #define	SSIZE		2		/* initial stack size in pages */
 #define	USPACE		(SSIZE*8192)
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 
 
 /*
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index e95a3176de6..ccaa04871e1 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.26 2004/04/19 22:55:51 deraadt Exp $ */
+/*	$OpenBSD: param.h,v 1.27 2004/08/06 22:31:31 mickey Exp $ */
 /*      $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $    */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -87,6 +87,7 @@
 
 #define	UPAGES		2		/* pages of u-area */
 #define USPACE		(NBPG*UPAGES)
+#define	USPACE_ALIGN	(0)		/* u-area alignment 0-none */
 #define	REDZONEADDR	(VAX_NBPG*3)	/* Must be > sizeof(struct user) */
 
 #ifndef MSGBUFSIZE
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 9d217e76f37..4fc2dd5c8f0 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_fork.c,v 1.71 2004/08/04 21:49:19 art Exp $	*/
+/*	$OpenBSD: kern_fork.c,v 1.72 2004/08/06 22:31:30 mickey Exp $	*/
 /*	$NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $	*/
 
 /*
@@ -170,7 +170,7 @@ fork1(struct proc *p1, int exitsig, int flags, void *stack, size_t stacksize,
 	/*
 	 * Allocate a pcb and kernel stack for the process
 	 */
-	uaddr = uvm_km_valloc(kernel_map, USPACE);
+	uaddr = uvm_km_valloc_align(kernel_map, USPACE, USPACE_ALIGN);
 	if (uaddr == 0) {
 		chgproccnt(uid, -1);
 		nprocs--;