--- src/sys/kern/init_main.c	2005/10/08 19:46:50	1.46
+++ src/sys/kern/init_main.c	2005/10/09 21:38:04	1.47
@@ -274,9 +274,11 @@ proc0_init(void *dummy __unused)
 {
 	struct filedesc	*fdp;
 	struct proc *p;
+	struct lwp *lp;
 	unsigned i;
 
 	p = &proc0;
+	lp = &proc0.p_lwp;	/* XXX lwp to be: lwp0 */
 
 	/*
 	 * Initialize process and pgrp structures.
@@ -307,7 +309,7 @@ proc0_init(void *dummy __unused)
 	session0.s_leader = p;
 
 	p->p_sysent = &aout_sysvec;
-	TAILQ_INIT(&p->p_sysmsgq);
+	TAILQ_INIT(&lp->lwp_sysmsgq);
 
 	p->p_flag = P_INMEM | P_SYSTEM;
 	p->p_stat = SRUN;
@@ -319,6 +321,7 @@ proc0_init(void *dummy __unused)
 	p->p_leader = p;
 
 	bcopy("swapper", p->p_comm, sizeof ("swapper"));
+	bcopy("swapper", thread0.td_comm, sizeof ("swapper"));
 
 	/* Create credentials. */
 	p->p_ucred = crget();