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

Remember initprocess instead of initproc.

ok matthew@ blambert@

4 files changed, 9 insertions, 9 deletions

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;