It's init as a process that's special, not init's original thread.

Remember initprocess instead of initproc.

ok matthew@ blambert@

15 files changed, 47 insertions, 42 deletions

diff --git a/sys/arch/landisk/dev/power.c b/sys/arch/landisk/dev/power.c
index cfe383ed948..dbce1ee0f10 100644
--- a/sys/arch/landisk/dev/power.c
+++ b/sys/arch/landisk/dev/power.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: power.c,v 1.5 2011/06/24 19:47:48 naddy Exp $	*/
+/*	$OpenBSD: power.c,v 1.6 2014/07/11 08:18:30 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007 Martin Reindl.
@@ -107,7 +107,7 @@ power_intr(void *arg)
 		_reg_write_1(LANDISK_PWRSW_INTCLR, 1);
 		if (allowpowerdown == 1) {
 			allowpowerdown = 0;
-			psignal(initproc, SIGUSR1);
+			prsignal(initprocess, SIGUSR1);
 		}
 		return (1);
 	}
diff --git a/sys/arch/sgi/dev/power.c b/sys/arch/sgi/dev/power.c
index ed8350a51c8..635c2700baa 100644
--- a/sys/arch/sgi/dev/power.c
+++ b/sys/arch/sgi/dev/power.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: power.c,v 1.14 2011/06/24 19:47:49 naddy Exp $	*/
+/*	$OpenBSD: power.c,v 1.15 2014/07/11 08:18:30 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007 Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -142,7 +142,7 @@ power_intr(void *unused)
 
 	if (allowpowerdown == 1) {
 		allowpowerdown = 0;
-		psignal(initproc, SIGUSR2);
+		prsignal(initprocess, SIGUSR2);
 	}
 
 	return 1;
diff --git a/sys/arch/sgi/hpc/panel.c b/sys/arch/sgi/hpc/panel.c
index 2e4e1ed5467..b4fdc9dca61 100644
--- a/sys/arch/sgi/hpc/panel.c
+++ b/sys/arch/sgi/hpc/panel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: panel.c,v 1.2 2013/11/04 11:57:26 mpi Exp $	*/
+/*	$OpenBSD: panel.c,v 1.3 2014/07/11 08:18:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2012 Miodrag Vallat.
@@ -150,7 +150,7 @@ panel_intr(void *v)
 	    (reg & IOC_PANEL_POWER_IRQ) == 0) {
 		if (allowpowerdown == 1) {
 			allowpowerdown = 0;
-			psignal(initproc, SIGUSR2);
+			prsignal(initprocess, SIGUSR2);
 		}
 	}
 
diff --git a/sys/arch/sparc64/dev/power.c b/sys/arch/sparc64/dev/power.c
index 560e2e63b3b..bde18c16559 100644
--- a/sys/arch/sparc64/dev/power.c
+++ b/sys/arch/sparc64/dev/power.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: power.c,v 1.6 2011/06/24 19:47:49 naddy Exp $	*/
+/*	$OpenBSD: power.c,v 1.7 2014/07/11 08:18:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 Jason L. Wright (jason@thought.net)
@@ -136,7 +136,7 @@ power_intr(void *vsc)
 
 	if (allowpowerdown == 1) {
 		allowpowerdown = 0;
-		psignal(initproc, SIGUSR2);
+		prsignal(initprocess, SIGUSR2);
 	}
 	return (1);
 }
diff --git a/sys/arch/sparc64/dev/rtc.c b/sys/arch/sparc64/dev/rtc.c
index ae69bc342ac..a4d677ec867 100644
--- a/sys/arch/sparc64/dev/rtc.c
+++ b/sys/arch/sparc64/dev/rtc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtc.c,v 1.9 2011/06/24 19:47:49 naddy Exp $	*/
+/*	$OpenBSD: rtc.c,v 1.10 2014/07/11 08:18:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -212,7 +212,7 @@ rtc_intr(void *arg)
 
 	if (allowpowerdown == 1) {
 		allowpowerdown = 0;
-		psignal(initproc, SIGUSR2);
+		prsignal(initprocess, SIGUSR2);
 	}
 	return (1);
 }
diff --git a/sys/arch/zaurus/dev/zaurus_kbd.c b/sys/arch/zaurus/dev/zaurus_kbd.c
index fc8eb68c5c4..a110b651304 100644
--- a/sys/arch/zaurus/dev/zaurus_kbd.c
+++ b/sys/arch/zaurus/dev/zaurus_kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zaurus_kbd.c,v 1.35 2014/07/11 07:47:22 guenther Exp $ */
+/* $OpenBSD: zaurus_kbd.c,v 1.36 2014/07/11 08:18:31 guenther Exp $ */
 /*
  * Copyright (c) 2005 Dale Rahn <drahn@openbsd.org>
  *
@@ -428,7 +428,7 @@ zkbd_on(void *v)
 		if (ratecheck(&zkbdontv, &zkbdhalttv)) {
 			if (allowpowerdown == 1) {
 				allowpowerdown = 0;
-				psignal(initproc, SIGUSR2);
+				prsignal(initprocess, SIGUSR2);
 			}
 		} else if (ratecheck(&zkbdontv, &zkbdsleeptv)) {
 			apm_suspends++;
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index a561faaadee..b6a5c155c66 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.262 2014/07/11 03:06:08 mlarkin Exp $ */
+/* $OpenBSD: acpi.c,v 1.263 2014/07/11 08:18:31 guenther Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -1628,7 +1628,7 @@ acpi_powerdown_task(void *arg0, int dummy)
 
 	if (allowpowerdown == 1) {
 		allowpowerdown = 0;
-		psignal(initproc, SIGUSR2);
+		prsignal(initprocess, SIGUSR2);
 	}
 }
 
diff --git a/sys/dev/acpi/acpitz.c b/sys/dev/acpi/acpitz.c
index e9455b28ae6..3266efc9222 100644
--- a/sys/dev/acpi/acpitz.c
+++ b/sys/dev/acpi/acpitz.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitz.c,v 1.45 2014/04/13 06:32:41 deraadt Exp $ */
+/* $OpenBSD: acpitz.c,v 1.46 2014/07/11 08:18:31 guenther Exp $ */
 /*
  * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
@@ -344,7 +344,7 @@ acpitz_refresh(void *arg)
 		/* do critical shutdown */
 		printf("%s: critical temperature exceeded %dC, shutting "
 		    "down\n", DEVNAME(sc), KTOC(sc->sc_tmp));
-		psignal(initproc, SIGUSR2);
+		prsignal(initprocess, SIGUSR2);
 	}
 	if (sc->sc_hot != -1 && sc->sc_hot <= sc->sc_tmp) {
 		printf("%s: _HOT temperature\n", DEVNAME(sc));
diff --git a/sys/dev/vmt.c b/sys/dev/vmt.c
index 52fb0c8d507..4e586bc8c73 100644
--- a/sys/dev/vmt.c
+++ b/sys/dev/vmt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmt.c,v 1.17 2014/03/29 18:09:30 guenther Exp $ */
+/*	$OpenBSD: vmt.c,v 1.18 2014/07/11 08:18:31 guenther Exp $ */
 
 /*
  * Copyright (c) 2007 David Crawshaw <david@zentus.com>
@@ -427,7 +427,7 @@ vmt_do_shutdown(struct vmt_softc *sc)
 	vm_rpc_send_str(&sc->sc_tclo_rpc, VM_RPC_REPLY_OK);
 
 	log(LOG_KERN | LOG_NOTICE, "Shutting down in response to request from VMware host\n");
-	psignal(initproc, SIGUSR2);
+	prsignal(initprocess, SIGUSR2);
 }
 
 void
@@ -437,7 +437,7 @@ vmt_do_reboot(struct vmt_softc *sc)
 	vm_rpc_send_str(&sc->sc_tclo_rpc, VM_RPC_REPLY_OK);
 
 	log(LOG_KERN | LOG_NOTICE, "Rebooting in response to request from VMware host\n");
-	psignal(initproc, SIGINT);
+	prsignal(initprocess, SIGINT);
 }
 
 void
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index cc664f29301..7d2a7160a22 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbd.c,v 1.78 2014/05/15 09:29:38 mpi Exp $ */
+/* $OpenBSD: wskbd.c,v 1.79 2014/07/11 08:18:31 guenther Exp $ */
 /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
 
 /*
@@ -1505,7 +1505,7 @@ internal_command(struct wskbd_softc *sc, u_int *type, keysym_t ksym,
 #endif
 		case 1:
 			kbd_reset = 0;
-			psignal(initproc, SIGUSR1);
+			prsignal(initprocess, SIGUSR1);
 			break;
 		default:
 			break;
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index fa5444ce1aa..3ca4b9e1fb0 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.215 2014/07/08 17:19:25 deraadt Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.216 2014/07/11 08:18:31 guenther Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -114,7 +114,7 @@ struct	process process0;
 struct	plimit limit0;
 struct	vmspace vmspace0;
 struct	sigacts sigacts0;
-struct	proc *initproc;
+struct	process *initprocess;
 struct	proc *reaperproc;
 
 int	cmask = CMASK;
@@ -431,15 +431,20 @@ main(void *framep)
 	 * wait for us to inform it that the root file system has been
 	 * mounted.
 	 */
-	if (fork1(p, FORK_FORK, NULL, 0, start_init, NULL, NULL,
-	    &initproc))
-		panic("fork init");
+	{
+		struct proc *initproc;
+
+		if (fork1(p, FORK_FORK, NULL, 0, start_init, NULL, NULL,
+		    &initproc))
+			panic("fork init");
+		initprocess = initproc->p_p;
+	}
 
 	randompid = 1;
 
 	/*
 	 * Create any kernel threads whose creation was deferred because
-	 * initproc had not yet been created.
+	 * initprocess had not yet been created.
 	 */
 	kthread_run_deferred_queue();
 
@@ -478,13 +483,13 @@ main(void *framep)
 	p->p_fd->fd_rdir = NULL;
 
 	/*
-	 * Now that root is mounted, we can fixup initproc's CWD
+	 * Now that root is mounted, we can fixup initprocess's CWD
 	 * info.  All other processes are kthreads, which merely
 	 * share proc0's CWD info.
 	 */
-	initproc->p_fd->fd_cdir = rootvnode;
-	vref(initproc->p_fd->fd_cdir);
-	initproc->p_fd->fd_rdir = NULL;
+	initprocess->ps_fd->fd_cdir = rootvnode;
+	vref(initprocess->ps_fd->fd_cdir);
+	initprocess->ps_fd->fd_rdir = NULL;
 
 	/*
 	 * Now can look at time, having had a chance to verify the time
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 31164ad99cb..24d9305bb6e 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exit.c,v 1.145 2014/07/08 17:19:25 deraadt Exp $	*/
+/*	$OpenBSD: kern_exit.c,v 1.146 2014/07/11 08:18:31 guenther Exp $	*/
 /*	$NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $	*/
 
 /*
@@ -286,10 +286,10 @@ exit1(struct proc *p, int rv, int flags)
 		 */
 		qr = LIST_FIRST(&pr->ps_children);
 		if (qr)		/* only need this if any child is S_ZOMB */
-			wakeup(initproc->p_p);
+			wakeup(initprocess);
 		for (; qr != 0; qr = nqr) {
 			nqr = LIST_NEXT(qr, ps_sibling);
-			proc_reparent(qr, initproc->p_p);
+			proc_reparent(qr, initprocess);
 			/*
 			 * Traced processes are killed since their
 			 * existence means someone is screwing up.
@@ -339,7 +339,7 @@ exit1(struct proc *p, int rv, int flags)
 		 */
 		if (pr->ps_flags & PS_NOZOMBIE) {
 			struct process *ppr = pr->ps_pptr;
-			proc_reparent(pr, initproc->p_p);
+			proc_reparent(pr, initprocess);
 			wakeup(ppr);
 		}
 
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index f46e714d219..0c6294f6b5e 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.169 2014/07/08 17:19:25 deraadt Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.170 2014/07/11 08:18:31 guenther Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -324,7 +324,7 @@ setsigvec(struct proc *p, int signum, struct sigaction *sa)
 		 * for PID 1.
 		 * XXX exit1 rework means this is unnecessary?
 		 */
-		if (initproc->p_p->ps_sigacts != ps &&
+		if (initprocess->ps_sigacts != ps &&
 		    ((sa->sa_flags & SA_NOCLDWAIT) ||
 		    sa->sa_handler == SIG_IGN))
 			atomic_setbits_int(&ps->ps_flags, SAS_NOCLDWAIT);
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 088d4f35fff..56cf0e0ea19 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_process.c,v 1.61 2014/05/04 05:03:26 guenther Exp $	*/
+/*	$OpenBSD: sys_process.c,v 1.62 2014/07/11 08:18:31 guenther Exp $	*/
 /*	$NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $	*/
 
 /*-
@@ -492,7 +492,7 @@ sys_ptrace(struct proc *p, void *v, register_t *retval)
 			struct process *ppr;
 
 			ppr = prfind(tr->ps_oppid);
-			proc_reparent(tr, ppr ? ppr : initproc->p_p);
+			proc_reparent(tr, ppr ? ppr : initprocess);
 		}
 
 		/* not being traced any more */
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index d4d5a1ed7d1..9ed61707e4c 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.187 2014/07/04 05:58:30 guenther Exp $	*/
+/*	$OpenBSD: proc.h,v 1.188 2014/07/11 08:18:31 guenther Exp $	*/
 /*	$NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $	*/
 
 /*-
@@ -451,8 +451,8 @@ extern struct processlist allprocess;	/* List of all processes. */
 extern struct processlist zombprocess;	/* List of zombie processes. */
 extern struct proclist allproc;		/* List of all threads. */
 
-extern struct proc *initproc;		/* Process slot for init. */
-extern struct proc *reaperproc;		/* Process slot for reaper. */
+extern struct process *initprocess;	/* Process slot for init. */
+extern struct proc *reaperproc;		/* Thread slot for reaper. */
 extern struct proc *syncerproc;		/* filesystem syncer daemon */
 
 extern struct pool process_pool;	/* memory pool for processes */