Fix two bogons created by 'patch(1)' in my last commit.

2 files changed, 11 insertions, 8 deletions

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index ae0ad33..609e001 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.99 1998/10/15 17:09:19 peter Exp $
+ * $Id: init_main.c,v 1.100 1998/12/19 02:55:33 julian Exp $
  */
 
 #include "opt_devfs.h"
@@ -469,14 +469,15 @@ proc0_init(dummy)
 #endif	/* INCOMPAT_LITES2*/
 #endif
 
-	/*
 #ifndef COMPAT_LINUX_THREADS
+	/*
 	 * We continue to place resource usage info and signal
 	 * actions in the user struct so they're pageable.
 	 */
 	p->p_stats = &p->p_addr->u_stats;
 	p->p_sigacts = &p->p_addr->u_sigacts;
 #else
+	/*
 	 * We continue to place resource usage info in the user struct so
 	 * it's pageable.
 	 */
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 3313149..ce4786f 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.77 1998/10/13 08:24:43 dg Exp $
+ * $Id: vm_glue.c,v 1.78 1998/12/19 02:55:34 julian Exp $
  */
 
 #include "opt_rlimit.h"
@@ -229,20 +229,22 @@ vm_fork(p1, p2, flags)
 
 	up = p2->p_addr;
 
-	/*
 #ifndef COMPAT_LINUX_THREADS
+	/*
 	 * p_stats and p_sigacts currently point at fields in the user struct
 	 * but not at &u, instead at p_addr. Copy p_sigacts and parts of
+	 * p_stats; zero the rest of p_stats (statistics).
+	 */
+	p2->p_stats = &up->u_stats;
+	p2->p_sigacts = &up->u_sigacts;
+	up->u_sigacts = *p1->p_sigacts;
 #else
+	/*
 	 * p_stats currently points at fields in the user struct
 	 * but not at &u, instead at p_addr. Copy parts of
-#endif /* COMPAT_LINUX_THREADS */
 	 * p_stats; zero the rest of p_stats (statistics).
 	 */
 	p2->p_stats = &up->u_stats;
-#ifndef COMPAT_LINUX_THREADS
-	p2->p_sigacts = &up->u_sigacts;
-	up->u_sigacts = *p1->p_sigacts;
 #endif /* COMPAT_LINUX_THREADS */
 	bzero(&up->u_stats.pstat_startzero,
 	    (unsigned) ((caddr_t) &up->u_stats.pstat_endzero -