p_comm is the process's command and isn't per thread, so move it from

struct proc to struct process.

ok deraadt@ kettenis@

38 files changed, 126 insertions, 134 deletions

diff --git a/lib/libkvm/kvm_file2.c b/lib/libkvm/kvm_file2.c
index 46aee3da694..183ee4e1666 100644
--- a/lib/libkvm/kvm_file2.c
+++ b/lib/libkvm/kvm_file2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_file2.c,v 1.51 2016/11/07 00:26:33 guenther Exp $	*/
+/*	$OpenBSD: kvm_file2.c,v 1.52 2017/01/21 05:42:04 guenther Exp $	*/
 
 /*
  * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -273,7 +273,6 @@ kvm_deadfile_byid(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
 	struct filedesc0 filed0;
 #define filed	filed0.fd_fd
 	struct processlist allprocess;
-	struct proc proc;
 	struct process *pr, process;
 	struct ucred ucred;
 	char *filebuf = NULL;
@@ -327,15 +326,6 @@ kvm_deadfile_byid(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
 		if (process.ps_flags & (PS_SYSTEM | PS_EMBRYO | PS_EXITING))
 			continue;
 
-		if (process.ps_mainproc == NULL)
-			continue;
-		/* XXX only needed for p_comm now */
-		if (KREAD(kd, (u_long)process.ps_mainproc, &proc)) {
-			_kvm_err(kd, kd->program, "can't read proc at %lx",
-			    (u_long)process.ps_mainproc);
-			goto cleanup;
-		}
-
 		if (op == KERN_FILE_BYPID) {
 			/* check if this is the pid we are looking for */
 			if (arg > 0 && process.ps_pid != (pid_t)arg)
@@ -348,8 +338,6 @@ kvm_deadfile_byid(kvm_t *kd, int op, int arg, size_t esize, int *cnt)
 			    (u_long)process.ps_ucred);
 			goto cleanup;
 		}
-		process.ps_mainproc = &proc;
-		proc.p_p = &process;
 		process.ps_ucred = &ucred;
 
 		if (op == KERN_FILE_BYUID && arg >= 0 &&
@@ -731,8 +719,7 @@ fill_file(kvm_t *kd, struct kinfo_file *kf, struct file *fp, u_long fpaddr,
 		kf->p_uid = pr->ps_ucred->cr_uid;
 		kf->p_gid = pr->ps_ucred->cr_gid;
 		kf->p_tid = -1;
-		strlcpy(kf->p_comm, pr->ps_mainproc->p_comm,
-		    sizeof(kf->p_comm));
+		strlcpy(kf->p_comm, pr->ps_comm, sizeof(kf->p_comm));
 		if (pr->ps_fd != NULL)
 			kf->fd_ofileflags = pr->ps_fd->fd_ofileflags[fd];
 	}
diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c
index d179c1309df..868be573661 100644
--- a/sys/arch/alpha/alpha/interrupt.c
+++ b/sys/arch/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.39 2016/10/08 05:49:08 guenther Exp $ */
+/* $OpenBSD: interrupt.c,v 1.40 2017/01/21 05:42:03 guenther Exp $ */
 /* $NetBSD: interrupt.c,v 1.46 2000/06/03 20:47:36 thorpej Exp $ */
 
 /*-
@@ -348,7 +348,7 @@ fatal:
 	printf("    curproc = %p\n", curproc);
 	if (curproc != NULL)
 		printf("        pid = %d, comm = %s\n", curproc->p_p->ps_pid,
-		    curproc->p_comm);
+		    curproc->p_p->ps_comm);
 	printf("\n");
 	panic("machine check");
 }
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c
index abab88d9240..27f269393b1 100644
--- a/sys/arch/alpha/alpha/trap.c
+++ b/sys/arch/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.82 2016/10/08 05:49:08 guenther Exp $ */
+/* $OpenBSD: trap.c,v 1.83 2017/01/21 05:42:03 guenther Exp $ */
 /* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */
 
 /*-
@@ -206,7 +206,7 @@ printtrap(const unsigned long a0, const unsigned long a1,
 	printf("    curproc    = %p\n", curproc);
 	if (curproc != NULL)
 		printf("        pid = %d, comm = %s\n",
-		    curproc->p_p->ps_pid, curproc->p_comm);
+		    curproc->p_p->ps_pid, curproc->p_p->ps_comm);
 	printf("\n");
 }
 
@@ -459,7 +459,8 @@ do_fault:
 			typ = SEGV_MAPERR;
 			if (rv == ENOMEM) {
 				printf("UVM: pid %u (%s), uid %d killed: "
-				   "out of swap\n", p->p_p->ps_pid, p->p_comm,
+				   "out of swap\n", p->p_p->ps_pid,
+				   p->p_p->ps_comm,
 				   p->p_ucred ? (int)p->p_ucred->cr_uid : -1);
 				i = SIGKILL;
 			} else {
@@ -982,7 +983,7 @@ unaligned_fixup(va, opcode, reg, p)
 	if (doprint) {
 		uprintf(
 		"pid %u (%s): unaligned access: va=0x%lx pc=0x%lx ra=0x%lx op=",
-		    p->p_p->ps_pid, p->p_comm, va,
+		    p->p_p->ps_pid, p->p_p->ps_comm, va,
 		    p->p_md.md_tf->tf_regs[FRAME_PC] - 4,
 		    p->p_md.md_tf->tf_regs[FRAME_RA]);
 		uprintf(selected_tab->type,opcode);
diff --git a/sys/arch/amd64/amd64/trap.c b/sys/arch/amd64/amd64/trap.c
index 2fe0a90d458..237803c0d48 100644
--- a/sys/arch/amd64/amd64/trap.c
+++ b/sys/arch/amd64/amd64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.51 2016/10/08 05:49:08 guenther Exp $	*/
+/*	$OpenBSD: trap.c,v 1.52 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: trap.c,v 1.2 2003/05/04 23:51:56 fvdl Exp $	*/
 
 /*-
@@ -245,7 +245,8 @@ copyfault:
 	case T_NMI|T_USER:
 #ifdef TRAP_SIGDEBUG
 		printf("pid %d (%s): %s at rip %llx addr %llx\n",
-		    p->p_p->ps_pid, p->p_comm, "BUS", frame->tf_rip, rcr2());
+		    p->p_p->ps_pid, p->p_p->ps_comm, "BUS",
+		    frame->tf_rip, rcr2());
 		frame_dump(frame);
 #endif
 		sv.sival_ptr = (void *)frame->tf_rip;
@@ -269,7 +270,8 @@ copyfault:
 	case T_FPOPFLT|T_USER:		/* coprocessor operand fault */
 #ifdef TRAP_SIGDEBUG
 		printf("pid %d (%s): %s at rip %llx addr %llx\n",
-		    p->p_p->ps_pid, p->p_comm, "ILL", frame->tf_rip, rcr2());
+		    p->p_p->ps_pid, p->p_p->ps_comm, "ILL",
+		    frame->tf_rip, rcr2());
 		frame_dump(frame);
 #endif
 		sv.sival_ptr = (void *)frame->tf_rip;
@@ -394,15 +396,15 @@ faultcommon:
 		}
 		if (error == ENOMEM) {
 			printf("UVM: pid %d (%s), uid %d killed:"
-			    " out of swap\n", p->p_p->ps_pid, p->p_comm,
+			    " out of swap\n", p->p_p->ps_pid, p->p_p->ps_comm,
 			    p->p_ucred ? (int)p->p_ucred->cr_uid : -1);
 			sv.sival_ptr = (void *)fa;
 			trapsignal(p, SIGKILL, T_PAGEFLT, SEGV_MAPERR, sv);
 		} else {
 #ifdef TRAP_SIGDEBUG
 			printf("pid %d (%s): %s at rip %llx addr %llx\n",
-			    p->p_p->ps_pid, p->p_comm, "SEGV", frame->tf_rip,
-			    rcr2());
+			    p->p_p->ps_pid, p->p_p->ps_comm, "SEGV",
+			    frame->tf_rip, rcr2());
 			frame_dump(frame);
 #endif
 			sv.sival_ptr = (void *)fa;
diff --git a/sys/arch/arm/arm/fault.c b/sys/arch/arm/arm/fault.c
index 9d86ceca986..9ff47c590ba 100644
--- a/sys/arch/arm/arm/fault.c
+++ b/sys/arch/arm/arm/fault.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fault.c,v 1.26 2017/01/06 00:06:02 jsg Exp $	*/
+/*	$OpenBSD: fault.c,v 1.27 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: fault.c,v 1.46 2004/01/21 15:39:21 skrll Exp $	*/
 
 /*
@@ -348,7 +348,7 @@ data_abort_handler(trapframe_t *tf)
 	sv.sival_ptr = (u_int32_t *)far;
 	if (error == ENOMEM) {
 		printf("UVM: pid %d (%s), uid %d killed: "
-		    "out of swap\n", p->p_p->ps_pid, p->p_comm,
+		    "out of swap\n", p->p_p->ps_pid, p->p_p->ps_comm,
 		    p->p_ucred ? (int)p->p_ucred->cr_uid : -1);
 		sd.signo = SIGKILL;
 	} else
@@ -621,7 +621,7 @@ prefetch_abort_handler(trapframe_t *tf)
 	sv.sival_ptr = (u_int32_t *)far;
 	if (error == ENOMEM) {
 		printf("UVM: pid %d (%s), uid %d killed: "
-		    "out of swap\n", p->p_p->ps_pid, p->p_comm,
+		    "out of swap\n", p->p_p->ps_pid, p->p_p->ps_comm,
 		    p->p_ucred ? (int)p->p_ucred->cr_uid : -1);
 		trapsignal(p, SIGKILL, 0, SEGV_MAPERR, sv);
 	} else
diff --git a/sys/arch/armv7/exynos/exesdhc.c b/sys/arch/armv7/exynos/exesdhc.c
index 9f63345a6d7..8f61bc9a442 100644
--- a/sys/arch/armv7/exynos/exesdhc.c
+++ b/sys/arch/armv7/exynos/exesdhc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exesdhc.c,v 1.8 2016/07/26 22:10:10 patrick Exp $	*/
+/*	$OpenBSD: exesdhc.c,v 1.9 2017/01/21 05:42:03 guenther Exp $	*/
 /*
  * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -679,7 +679,7 @@ exesdhc_start_command(struct exesdhc_softc *sc, struct sdmmc_command *cmd)
 	DPRINTF(1,("%s: start cmd %u arg=%#x data=%p dlen=%d flags=%#x "
 	    "proc=\"%s\"\n", HDEVNAME(sc), cmd->c_opcode, cmd->c_arg,
 	    cmd->c_data, cmd->c_datalen, cmd->c_flags, curproc ?
-	    curproc->p_comm : ""));
+	    curproc->p_p->ps_comm : ""));
 
 	/*
 	 * The maximum block length for commands should be the minimum
diff --git a/sys/arch/armv7/imx/imxesdhc.c b/sys/arch/armv7/imx/imxesdhc.c
index 6cec0554de6..0022de6c682 100644
--- a/sys/arch/armv7/imx/imxesdhc.c
+++ b/sys/arch/armv7/imx/imxesdhc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imxesdhc.c,v 1.35 2016/12/28 22:45:24 kettenis Exp $	*/
+/*	$OpenBSD: imxesdhc.c,v 1.36 2017/01/21 05:42:03 guenther Exp $	*/
 /*
  * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -857,7 +857,7 @@ imxesdhc_start_command(struct imxesdhc_softc *sc, struct sdmmc_command *cmd)
 	DPRINTF(1,("%s: start cmd %u arg=%#x data=%p dlen=%d flags=%#x "
 	    "proc=\"%s\"\n", HDEVNAME(sc), cmd->c_opcode, cmd->c_arg,
 	    cmd->c_data, cmd->c_datalen, cmd->c_flags, curproc ?
-	    curproc->p_comm : ""));
+	    curproc->p_p->ps_comm : ""));
 
 	/*
 	 * The maximum block length for commands should be the minimum
diff --git a/sys/arch/armv7/omap/ommmc.c b/sys/arch/armv7/omap/ommmc.c
index 184f182d8cf..ee25c31a42e 100644
--- a/sys/arch/armv7/omap/ommmc.c
+++ b/sys/arch/armv7/omap/ommmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ommmc.c,v 1.30 2016/10/08 03:42:20 jsg Exp $	*/
+/*	$OpenBSD: ommmc.c,v 1.31 2017/01/21 05:42:03 guenther Exp $	*/
 
 /*
  * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
@@ -908,7 +908,7 @@ ommmc_start_command(struct ommmc_softc *sc, struct sdmmc_command *cmd)
 	DPRINTF(1,("%s: start cmd %u arg=%#x data=%p dlen=%d flags=%#x "
 	    "proc=\"%s\"\n", DEVNAME(sc), cmd->c_opcode, cmd->c_arg,
 	    cmd->c_data, cmd->c_datalen, cmd->c_flags, curproc ?
-	    curproc->p_comm : ""));
+	    curproc->p_p->ps_comm : ""));
 
 	/*
 	 * The maximum block length for commands should be the minimum
diff --git a/sys/arch/mips64/mips64/fp_emulate.c b/sys/arch/mips64/mips64/fp_emulate.c
index a7e0d213c8e..50251be956f 100644
--- a/sys/arch/mips64/mips64/fp_emulate.c
+++ b/sys/arch/mips64/mips64/fp_emulate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fp_emulate.c,v 1.14 2016/03/06 19:42:27 mpi Exp $	*/
+/*	$OpenBSD: fp_emulate.c,v 1.15 2017/01/21 05:42:03 guenther Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -201,11 +201,11 @@ MipsFPTrap(struct trapframe *tf)
 #ifdef DEBUG
 #ifdef DDB
 	printf("%s: unimplemented FPU completion, fsr 0x%08x\n0x%lx: ",
-	    p->p_comm, fsr, pc);
+	    p->p_p->ps_comm, fsr, pc);
 	dbmd_print_insn(insn, pc, printf);
 #else
 	printf("%s: unimplemented FPU completion, insn 0x%08x fsr 0x%08x\n",
-	    p->p_comm, insn, fsr);
+	    p->p_p->ps_comm, insn, fsr);
 #endif
 #endif
 
diff --git a/sys/arch/mips64/mips64/pmap.c b/sys/arch/mips64/mips64/pmap.c
index 89692551ffd..6b82703f250 100644
--- a/sys/arch/mips64/mips64/pmap.c
+++ b/sys/arch/mips64/mips64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.100 2017/01/02 18:19:34 visa Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.101 2017/01/21 05:42:03 guenther Exp $	*/
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -1822,13 +1822,13 @@ pmap_alloc_tlbpid(struct proc *p)
 	if (curproc) {
 		DPRINTF(PDB_FOLLOW|PDB_TLBPID, 
 			("pmap_alloc_tlbpid: curproc %d '%s' ",
-				curproc->p_p->ps_pid, curproc->p_comm));
+				curproc->p_p->ps_pid, curproc->p_p->ps_comm));
 	} else {
 		DPRINTF(PDB_FOLLOW|PDB_TLBPID, 
 			("pmap_alloc_tlbpid: curproc <none> "));
 	}
 	DPRINTF(PDB_FOLLOW|PDB_TLBPID, ("segtab %p tlbpid %u pid %d '%s'\n",
-			pmap->pm_segtab, id, p->p_p->ps_pid, p->p_comm));
+			pmap->pm_segtab, id, p->p_p->ps_pid, p->p_p->ps_comm));
 
 	return (id);
 }
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index 7539154a7a1..817686c30e1 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.121 2016/10/19 08:28:20 guenther Exp $	*/
+/*	$OpenBSD: trap.c,v 1.122 2017/01/21 05:42:03 guenther Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -614,7 +614,7 @@ fault_common_no_miss:
 #ifdef DEBUG
 				printf("trap: %s (%d): breakpoint at %p "
 				    "(insn %08x)\n",
-				    p->p_comm, p->p_p->ps_pid,
+				    p->p_p->ps_comm, p->p_p->ps_pid,
 				    (void *)p->p_md.md_ss_addr,
 				    p->p_md.md_ss_instr);
 #endif
@@ -1075,7 +1075,7 @@ process_sstep(struct proc *p, int sstep)
 			if (rc != 0)
 				printf("WARNING: %s (%d): can't restore "
 				    "instruction at %p: %08x\n",
-				    p->p_comm, p->p_p->ps_pid,
+				    p->p_p->ps_comm, p->p_p->ps_pid,
 				    (void *)p->p_md.md_ss_addr,
 				    p->p_md.md_ss_instr);
 #endif
@@ -1101,7 +1101,7 @@ process_sstep(struct proc *p, int sstep)
 	if (p->p_md.md_ss_addr != 0) {
 		printf("WARNING: %s (%d): breakpoint request "
 		    "at %p, already set at %p\n",
-		    p->p_comm, p->p_p->ps_pid, (void *)va,
+		    p->p_p->ps_comm, p->p_p->ps_pid, (void *)va,
 		    (void *)p->p_md.md_ss_addr);
 		return EFAULT;
 	}
@@ -1121,7 +1121,7 @@ process_sstep(struct proc *p, int sstep)
 
 #ifdef DEBUG
 	printf("%s (%d): breakpoint set at %p: %08x (pc %p %08x)\n",
-		p->p_comm, p->p_p->ps_pid, (void *)p->p_md.md_ss_addr,
+		p->p_p->ps_comm, p->p_p->ps_pid, (void *)p->p_md.md_ss_addr,
 		p->p_md.md_ss_instr, (void *)locr0->pc, curinstr);
 #endif
 	return 0;
diff --git a/sys/arch/sh/sh/db_interface.c b/sys/arch/sh/sh/db_interface.c
index 2f518091531..6c0de3baf2e 100644
--- a/sys/arch/sh/sh/db_interface.c
+++ b/sys/arch/sh/sh/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.8 2016/05/18 20:21:13 guenther Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.9 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.37 2006/09/06 00:11:49 uwe Exp $	*/
 
 /*-
@@ -368,15 +368,10 @@ __db_procname_by_asid(int asid)
 {
 	static char notfound[] = "---";
 	struct process *pr;
-	struct proc *p;
 
 	LIST_FOREACH(pr, &allprocess, ps_list) {
-		/* find a thread that still has the process vmspace attached */
-		TAILQ_FOREACH(p, &pr->ps_threads, p_thr_link)
-			if (p->p_vmspace != NULL)
-				break;
-		if (p != NULL && p->p_vmspace->vm_map.pmap->pm_asid == asid)
-			return (p->p_comm);
+		if (pr->ps_vmspace->vm_map.pmap->pm_asid == asid)
+			return (pr->ps_comm);
 	}
 
 	return (notfound);
@@ -643,7 +638,7 @@ db_stackcheck_cmd(db_expr_t addr, int have_addr, db_expr_t count,
 		    pcb->pcb_sf.sf_r7_bank, i, i * 100 / MAX_STACK,
 		    (vaddr_t)pcb + PAGE_SIZE, j, j * 100 / MAX_FRAME,
 		    j / sizeof(struct trapframe),
-		    p->p_comm);
+		    p->p_p->ps_comm);
 	}
 #undef	MAX_STACK
 #undef	MAX_FRAME
diff --git a/sys/arch/sh/sh/trap.c b/sys/arch/sh/sh/trap.c
index 37f9cc9a748..bf0bd8415c9 100644
--- a/sys/arch/sh/sh/trap.c
+++ b/sys/arch/sh/sh/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.36 2016/10/08 05:49:09 guenther Exp $	*/
+/*	$OpenBSD: trap.c,v 1.37 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: exception.c,v 1.32 2006/09/04 23:57:52 uwe Exp $	*/
 /*	$NetBSD: syscall.c,v 1.6 2006/03/07 07:21:50 thorpej Exp $	*/
 
@@ -437,7 +437,7 @@ tlb_exception(struct proc *p, struct trapframe *tf, uint32_t va)
 		sv.sival_ptr = (void *)va;
 		if (err == ENOMEM) {
 			printf("UVM: pid %d (%s), uid %d killed: out of swap\n",
-			    p->p_p->ps_pid, p->p_comm,
+			    p->p_p->ps_pid, p->p_p->ps_comm,
 			    p->p_ucred ? (int)p->p_ucred->cr_uid : -1);
 			trapsignal(p, SIGKILL, tf->tf_expevt, SEGV_MAPERR, sv);
 		} else
diff --git a/sys/arch/sparc64/fpu/fpu.c b/sys/arch/sparc64/fpu/fpu.c
index 5961219f580..db0b0bd51eb 100644
--- a/sys/arch/sparc64/fpu/fpu.c
+++ b/sys/arch/sparc64/fpu/fpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu.c,v 1.19 2016/10/08 05:49:09 guenther Exp $	*/
+/*	$OpenBSD: fpu.c,v 1.20 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: fpu.c,v 1.11 2000/12/06 01:47:50 mrg Exp $ */
 
 /*
@@ -237,9 +237,9 @@ fpu_cleanup(p, fs)
 
 	case FSR_TT_HWERR:
 		log(LOG_ERR, "fpu hardware error (%s[%d])\n",
-		    p->p_comm, p->p_p->ps_pid);
+		    p->p_p->ps_comm, p->p_p->ps_pid);
 		uprintf("%s[%d]: fpu hardware error\n",
-		    p->p_comm, p->p_p->ps_pid);
+		    p->p_p->ps_comm, p->p_p->ps_pid);
 		KERNEL_LOCK();
 		trapsignal(p, SIGFPE, -1, FPE_FLTINV, sv);	/* ??? */
 		KERNEL_UNLOCK();
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 53d0e08bf8c..3c66d8e772c 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.182 2017/01/13 09:18:11 fcambus Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.183 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
 
 /*-
@@ -496,7 +496,7 @@ sendsig(sig_t catcher, int sig, int mask, u_long code, int type,
 #ifdef DEBUG
 	if (sigdebug & SDB_FOLLOW) {
 		printf("sendsig: %s[%d] sig %d scp %p\n",
-		    p->p_comm, p->p_p->ps_pid, sig, &fp->sf_sc);
+		    p->p_p->ps_comm, p->p_p->ps_pid, sig, &fp->sf_sc);
 	}
 #endif
 
diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c
index 107831b43cc..b19fd57df07 100644
--- a/sys/arch/sparc64/sparc64/trap.c
+++ b/sys/arch/sparc64/sparc64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.96 2016/12/20 13:47:38 jsg Exp $	*/
+/*	$OpenBSD: trap.c,v 1.97 2017/01/21 05:42:04 guenther Exp $	*/
 /*	$NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */
 
 /*
@@ -866,7 +866,7 @@ kfault:
 
 		if (rv == ENOMEM) {
 			printf("UVM: pid %d (%s), uid %d killed: out of swap\n",
-			    p->p_p->ps_pid, p->p_comm,
+			    p->p_p->ps_pid, p->p_p->ps_comm,
 			    p->p_ucred ? (int)p->p_ucred->cr_uid : -1);
 			trapsignal(p, SIGKILL, access_type, SEGV_MAPERR, sv);
 		} else {
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c
index 5e0a87ef9f7..b2ed0f23afc 100644
--- a/sys/dev/sdmmc/sdhc.c
+++ b/sys/dev/sdmmc/sdhc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdhc.c,v 1.52 2016/05/15 22:21:55 kettenis Exp $	*/
+/*	$OpenBSD: sdhc.c,v 1.53 2017/01/21 05:42:04 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -800,7 +800,7 @@ sdhc_start_command(struct sdhc_host *hp, struct sdmmc_command *cmd)
 	DPRINTF(1,("%s: start cmd %u arg=%#x data=%#x dlen=%d flags=%#x "
 	    "proc=\"%s\"\n", DEVNAME(hp->sc), cmd->c_opcode, cmd->c_arg,
 	    cmd->c_data, cmd->c_datalen, cmd->c_flags, curproc ?
-	    curproc->p_comm : ""));
+	    curproc->p_p->ps_comm : ""));
 
 	/*
 	 * The maximum block length for commands should be the minimum
diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c
index e09391698e5..c176c8b6100 100644
--- a/sys/dev/sdmmc/sdmmc.c
+++ b/sys/dev/sdmmc/sdmmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc.c,v 1.44 2016/05/05 11:01:08 kettenis Exp $	*/
+/*	$OpenBSD: sdmmc.c,v 1.45 2017/01/21 05:42:04 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -824,7 +824,7 @@ sdmmc_dump_command(struct sdmmc_softc *sc, struct sdmmc_command *cmd)
 	DPRINTF(1,("%s: cmd %u arg=%#x data=%p dlen=%d flags=%#x "
 	    "proc=\"%s\" (error %d)\n", DEVNAME(sc), cmd->c_opcode,
 	    cmd->c_arg, cmd->c_data, cmd->c_datalen, cmd->c_flags,
-	    curproc ? curproc->p_comm : "", cmd->c_error));
+	    curproc ? curproc->p_p->ps_comm : "", cmd->c_error));
 
 	if (cmd->c_error || sdmmcdebug < 1)
 		return;
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index d9896c84143..2bd6388246a 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc_scsi.c,v 1.37 2017/01/20 00:52:32 deraadt Exp $	*/
+/*	$OpenBSD: sdmmc_scsi.c,v 1.38 2017/01/21 05:42:04 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -313,7 +313,7 @@ sdmmc_scsi_cmd(struct scsi_xfer *xs)
 
 	DPRINTF(("%s: scsi cmd target=%d opcode=%#x proc=\"%s\" (poll=%#x)\n",
 	    DEVNAME(sc), link->target, xs->cmd->opcode, curproc ?
-	    curproc->p_comm : "", xs->flags & SCSI_POLL));
+	    curproc->p_p->ps_comm : "", xs->flags & SCSI_POLL));
 
 	xs->error = XS_NOERROR;
 
@@ -476,7 +476,7 @@ sdmmc_complete_xs(void *arg)
 
 	DPRINTF(("%s: scsi cmd target=%d opcode=%#x proc=\"%s\" (poll=%#x)"
 	    " complete\n", DEVNAME(sc), link->target, xs->cmd->opcode,
-	    curproc ? curproc->p_comm : "", xs->flags & SCSI_POLL));
+	    curproc ? curproc->p_p->ps_comm : "", xs->flags & SCSI_POLL));
 
 	s = splbio();
 
@@ -507,7 +507,7 @@ sdmmc_done_xs(struct sdmmc_ccb *ccb)
 
 	DPRINTF(("%s: scsi cmd target=%d opcode=%#x proc=\"%s\" (error=%#x)"
 	    " done\n", DEVNAME(sc), link->target, xs->cmd->opcode,
-	    curproc ? curproc->p_comm : "", xs->error));
+	    curproc ? curproc->p_p->ps_comm : "", xs->error));
 
 	xs->resid = 0;
 
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 3f161adc111..b7ae5de255f 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnd.c,v 1.162 2016/12/14 18:59:12 jca Exp $	*/
+/*	$OpenBSD: vnd.c,v 1.163 2017/01/21 05:42:04 guenther Exp $	*/
 /*	$NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $	*/
 
 /*
@@ -305,11 +305,11 @@ vndstrategy(struct buf *bp)
 		bp->b_bcount = ((origbcount + secsize - 1) & ~(secsize - 1));
 #ifdef DIAGNOSTIC
 		if (bp->b_bcount != origbcount) {
-			struct proc *curp = curproc;
+			struct process *curpr = curproc->p_p;
 			printf("%s: sloppy %s from proc %d (%s): "
 			    "blkno %lld bcount %ld\n", sc->sc_dev.dv_xname,
 			    (bp->b_flags & B_READ) ? "read" : "write",
-			    curp->p_p->ps_pid, curp->p_comm,
+			    curpr->ps_pid, curpr->ps_comm,
 			    (long long)bp->b_blkno, origbcount);
 		}
 #endif
diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index d51aecd0669..d21cf94276f 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.c,v 1.129 2016/11/07 00:26:32 guenther Exp $	*/
+/*	$OpenBSD: exec_elf.c,v 1.130 2017/01/21 05:42:03 guenther Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -1216,7 +1216,7 @@ ELFNAMEEND(coredump_notes)(struct proc *p, void *iocookie, size_t *sizep)
 		cpi.cpi_egid = p->p_ucred->cr_gid;
 		cpi.cpi_svgid = p->p_ucred->cr_svgid;
 
-		(void)strlcpy(cpi.cpi_name, p->p_comm, sizeof(cpi.cpi_name));
+		(void)strlcpy(cpi.cpi_name, pr->ps_comm, sizeof(cpi.cpi_name));
 
 		nhdr.namesz = sizeof("OpenBSD");
 		nhdr.descsz = sizeof(cpi);
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index d030dcc0a02..e21a8306854 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.264 2017/01/01 07:00:56 jsg Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.265 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -293,7 +293,7 @@ main(void *framep)
 	p->p_stat = SONPROC;
 	pr->ps_nice = NZERO;
 	pr->ps_emul = &emul_native;
-	strlcpy(p->p_comm, "swapper", sizeof(p->p_comm));
+	strlcpy(pr->ps_comm, "swapper", sizeof(pr->ps_comm));
 
 	/* Init timeouts. */
 	timeout_set(&p->p_sleep_to, endtsleep, p);
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 7c339ab1577..692eaa511fe 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_acct.c,v 1.32 2016/03/19 12:04:15 natano Exp $	*/
+/*	$OpenBSD: kern_acct.c,v 1.33 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: kern_acct.c,v 1.42 1996/02/04 02:15:12 christos Exp $	*/
 
 /*-
@@ -176,7 +176,7 @@ acct_process(struct proc *p)
 	 */
 
 	/* (1) The name of the command that ran */
-	memcpy(acct.ac_comm, p->p_comm, sizeof acct.ac_comm);
+	memcpy(acct.ac_comm, pr->ps_comm, sizeof acct.ac_comm);
 
 	/* (2) The amount of user and system time that was used */
 	calctsru(&pr->ps_tu, &ut, &st, NULL);
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 6c3c6a5c89c..38a561a6c13 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.184 2016/10/22 02:09:14 guenther Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.185 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -492,9 +492,9 @@ sys_execve(struct proc *p, void *v, register_t *retval)
 	arc4random_buf(&pr->ps_sigcookie, sizeof pr->ps_sigcookie);
 
 	/* set command name & other accounting info */
-	memset(p->p_comm, 0, sizeof(p->p_comm));
+	memset(pr->ps_comm, 0, sizeof(pr->ps_comm));
 	len = min(nid.ni_cnd.cn_namelen, MAXCOMLEN);
-	memcpy(p->p_comm, nid.ni_cnd.cn_nameptr, len);
+	memcpy(pr->ps_comm, nid.ni_cnd.cn_nameptr, len);
 	pr->ps_acflag &= ~AFORK;
 
 	/* record proc's vnode, for use by sysctl */
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index 7b25abb16b7..80ee61dd77d 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_kthread.c,v 1.39 2016/11/07 00:26:32 guenther Exp $	*/
+/*	$OpenBSD: kern_kthread.c,v 1.40 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: kern_kthread.c,v 1.3 1998/12/22 21:21:36 kleink Exp $	*/
 
 /*-
@@ -71,7 +71,7 @@ kthread_create(void (*func)(void *), void *arg,
 		return (error);
 
 	/* Name it as specified. */
-	strlcpy(p->p_comm, name, sizeof p->p_comm);
+	strlcpy(p->p_p->ps_comm, name, sizeof p->p_p->ps_comm);
 
 	/* All done! */
 	if (newpp != NULL)
@@ -94,7 +94,7 @@ kthread_exit(int ecode)
 	 */
 	if (ecode != 0)
 		printf("WARNING: thread `%s' (%d) exits with status %d\n",
-		    curproc->p_comm, curproc->p_tid, ecode);
+		    curproc->p_p->ps_comm, curproc->p_tid, ecode);
 
 	exit1(curproc, W_EXITCODE(ecode, 0), EXIT_NORMAL);
 
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 2ba5dc967db..7897758a823 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_ktrace.c,v 1.89 2016/11/07 00:26:32 guenther Exp $	*/
+/*	$OpenBSD: kern_ktrace.c,v 1.90 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $	*/
 
 /*
@@ -135,9 +135,10 @@ ktrinitheaderraw(struct ktr_header *kth, uint type, pid_t pid, pid_t tid)
 void
 ktrinitheader(struct ktr_header *kth, struct proc *p, int type)
 {
-	ktrinitheaderraw(kth, type, p->p_p->ps_pid,
-	    p->p_tid + THREAD_PID_OFFSET);
-	memcpy(kth->ktr_comm, p->p_comm, MAXCOMLEN);
+	struct process *pr = p->p_p;
+
+	ktrinitheaderraw(kth, type, pr->ps_pid, p->p_tid + THREAD_PID_OFFSET);
+	memcpy(kth->ktr_comm, pr->ps_comm, MAXCOMLEN);
 }
 
 void
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c
index 8cf8c926b6e..59b9c351798 100644
--- a/sys/kern/kern_pledge.c
+++ b/sys/kern/kern_pledge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_pledge.c,v 1.188 2016/11/13 00:40:09 tb Exp $	*/
+/*	$OpenBSD: kern_pledge.c,v 1.189 2017/01/21 05:42:03 guenther Exp $	*/
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -525,7 +525,7 @@ sys_pledge(struct proc *p, void *v, register_t *retval)
 
 #ifdef DEBUG_PLEDGE
 		/* print paths registered as whilelisted (viewed as without chroot) */
-		DNPRINTF(1, "pledge: %s(%d): paths loaded:\n", p->p_comm,
+		DNPRINTF(1, "pledge: %s(%d): paths loaded:\n", pr->ps_comm,
 		    pr->ps_pid);
 		for (i = 0; i < wl->wl_count; i++)
 			if (wl->wl_paths[i].name)
@@ -576,7 +576,7 @@ pledge_fail(struct proc *p, int error, uint64_t code)
 			codes = pledgenames[i].name;
 			break;
 		}
-	printf("%s(%d): syscall %d \"%s\"\n", p->p_comm, p->p_p->ps_pid,
+	printf("%s(%d): syscall %d \"%s\"\n", p->p_p->ps_comm, p->p_p->ps_pid,
 	    p->p_pledge_syscall, codes);
 #ifdef KTRACE
 	if (KTRPOINT(p, KTR_PLEDGE))
@@ -824,7 +824,7 @@ pledge_namei_wlpath(struct proc *p, struct nameidata *ni)
 	if (error == ENOENT)
 		/* print the path that is reported as ENOENT */
 		DNPRINTF(1, "pledge: %s(%d): wl_path ENOENT: \"%s\"\n",
-		    p->p_comm, p->p_p->ps_pid, resolved);
+		    p->p_p->ps_comm, p->p_p->ps_pid, resolved);
 #endif
 
 	free(resolved, M_TEMP, resolvedlen);
@@ -1051,7 +1051,7 @@ pledge_sysctl(struct proc *p, int miblen, int *mib, void *new)
 		return (0);
 
 	printf("%s(%d): sysctl %d: %d %d %d %d %d %d\n",
-	    p->p_comm, p->p_p->ps_pid, miblen, mib[0], mib[1],
+	    p->p_p->ps_comm, p->p_p->ps_pid, miblen, mib[0], mib[1],
 	    mib[2], mib[3], mib[4], mib[5]);
 	return pledge_fail(p, EINVAL, 0);
 }
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index c84276b4e1c..ddf08ab2f12 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_proc.c,v 1.71 2016/11/07 00:26:32 guenther Exp $	*/
+/*	$OpenBSD: kern_proc.c,v 1.72 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: kern_proc.c,v 1.14 1996/02/09 18:59:41 christos Exp $	*/
 
 /*
@@ -421,7 +421,7 @@ proc_printit(struct proc *p, const char *modif,
 	else
 		pst = pstat[(int)p->p_stat - 1];
 
-	(*pr)("PROC (%s) tid=%d stat=%s\n", p->p_comm, p->p_tid, pst);
+	(*pr)("PROC (%s) pid=%d stat=%s\n", p->p_p->ps_comm, p->p_tid, pst);
 	(*pr)("    flags process=%b proc=%b\n",
 	    p->p_p->ps_flags, PS_BITS, p->p_flag, P_BITS);
 	(*pr)("    pri=%u, usrpri=%u, nice=%d\n",
@@ -504,7 +504,7 @@ db_show_all_procs(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 
 				case 'a':
 					db_printf("%-10.10s  %18p  %18p  %18p\n",
-					    p->p_comm, p, p->p_addr, p->p_vmspace);
+					    pr->ps_comm, p, p->p_addr, p->p_vmspace);
 					break;
 
 				case 'n':
@@ -515,11 +515,11 @@ db_show_all_procs(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 					    pr->ps_ucred->cr_ruid, p->p_stat,
 					    p->p_flag | pr->ps_flags,
 					    (p->p_wchan && p->p_wmesg) ?
-						p->p_wmesg : "", p->p_comm);
+						p->p_wmesg : "", pr->ps_comm);
 					break;
 
 				case 'w':
-					db_printf("%-16s  %-8s  %18p  %s\n", p->p_comm,
+					db_printf("%-16s  %-8s  %18p  %s\n", pr->ps_comm,
 					    pr->ps_emul->e_name, p->p_wchan,
 					    (p->p_wchan && p->p_wmesg) ? 
 						p->p_wmesg : "");
@@ -531,7 +531,7 @@ db_show_all_procs(db_expr_t addr, int haddr, db_expr_t count, char *modif)
 					    pr->ps_pid, pr->ps_ucred->cr_ruid,
 					    pr->ps_flags, p->p_flag,
 					    CPU_INFO_UNIT(p->p_cpu),
-					    p->p_comm);
+					    pr->ps_comm);
 					break;
 
 				}
diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c
index af00d867fe6..dd3d4ef0dc5 100644
--- a/sys/kern/kern_sched.c
+++ b/sys/kern/kern_sched.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sched.c,v 1.43 2016/06/03 15:21:23 kettenis Exp $	*/
+/*	$OpenBSD: kern_sched.c,v 1.44 2017/01/21 05:42:03 guenther Exp $	*/
 /*
  * Copyright (c) 2007, 2008 Artur Grabowski <art@openbsd.org>
  *
@@ -113,7 +113,8 @@ sched_kthreads_create(void *v)
 		panic("fork idle");
 
 	/* Name it as specified. */
-	snprintf(spc->spc_idleproc->p_comm, sizeof(spc->spc_idleproc->p_comm),
+	snprintf(spc->spc_idleproc->p_p->ps_comm,
+	    sizeof(spc->spc_idleproc->p_p->ps_comm),
 	    "idle%d", num);
 
 	num++;
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 95e75385e5f..b40eac85f90 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.206 2016/10/05 02:31:52 guenther Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.207 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -1511,12 +1511,12 @@ coredump(struct proc *p)
 		 * that core will silently fail.
 		 */
 		len = snprintf(name, sizeof(name), "%s/%s/%u.core",
-		    dir, p->p_comm, pr->ps_pid);
+		    dir, pr->ps_comm, pr->ps_pid);
 	} else if (incrash && nosuidcoredump == 2)
 		len = snprintf(name, sizeof(name), "%s/%s.core",
-		    dir, p->p_comm);
+		    dir, pr->ps_comm);
 	else
-		len = snprintf(name, sizeof(name), "%s.core", p->p_comm);
+		len = snprintf(name, sizeof(name), "%s.core", pr->ps_comm);
 	if (len >= sizeof(name))
 		return (EACCES);
 
@@ -1611,12 +1611,13 @@ coredump_write(void *cookie, enum uio_seg segflg, const void *data, size_t len)
 		    io->io_offset + coffset, segflg,
 		    IO_UNIT, io->io_cred, NULL, io->io_proc);
 		if (error) {
+			struct process *pr = io->io_proc->p_p;
 			if (error == ENOSPC)
 				log(LOG_ERR, "coredump of %s(%d) failed, filesystem full\n",
-				    io->io_proc->p_comm, io->io_proc->p_p->ps_pid);
+				    pr->ps_comm, pr->ps_pid);
 			else
 				log(LOG_ERR, "coredump of %s(%d), write failed: errno %d\n",
-				    io->io_proc->p_comm, io->io_proc->p_p->ps_pid, error);
+				    pr->ps_comm, pr->ps_pid, error);
 			return (error);
 		}
 
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index beeefe06458..98f85b79b93 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_synch.c,v 1.135 2016/09/13 08:32:44 mpi Exp $	*/
+/*	$OpenBSD: kern_synch.c,v 1.136 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $	*/
 
 /*
@@ -268,7 +268,7 @@ sleep_setup(struct sleep_state *sls, const volatile void *ident, int prio,
 
 #ifdef DIAGNOSTIC
 	if (p->p_flag & P_CANTSLEEP)
-		panic("sleep: %s failed insomnia", p->p_comm);
+		panic("sleep: %s failed insomnia", p->p_p->ps_comm);
 	if (ident == NULL)
 		panic("tsleep: no ident");
 	if (p->p_stat != SONPROC)
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 3d71d8851cd..66b2c3fd428 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sysctl.c,v 1.320 2016/11/11 18:59:09 mikeb Exp $	*/
+/*	$OpenBSD: kern_sysctl.c,v 1.321 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $	*/
 
 /*-
@@ -1214,8 +1214,7 @@ fill_file(struct kinfo_file *kf, struct file *fp, struct filedesc *fdp,
 		kf->p_uid = pr->ps_ucred->cr_uid;
 		kf->p_gid = pr->ps_ucred->cr_gid;
 		kf->p_tid = -1;
-		strlcpy(kf->p_comm, pr->ps_mainproc->p_comm,
-		    sizeof(kf->p_comm));
+		strlcpy(kf->p_comm, pr->ps_comm, sizeof(kf->p_comm));
 	}
 	if (fdp != NULL)
 		kf->fd_ofileflags = fdp->fd_ofileflags[fd];
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 3a1341ee954..975c6bc34d8 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_xxx.c,v 1.32 2016/12/18 20:10:39 patrick Exp $	*/
+/*	$OpenBSD: kern_xxx.c,v 1.33 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: kern_xxx.c,v 1.32 1996/04/22 01:38:41 christos Exp $	*/
 
 /*
@@ -94,6 +94,7 @@ int	scdebug = SCDEBUG_CALLS|SCDEBUG_RETURNS|SCDEBUG_SHOWARGS;
 void
 scdebug_call(struct proc *p, register_t code, const register_t args[])
 {
+	struct process *pr;
 	struct sysent *sy;
 	struct emul *em;
 	int i;
@@ -101,13 +102,14 @@ scdebug_call(struct proc *p, register_t code, const register_t args[])
 	if (!(scdebug & SCDEBUG_CALLS))
 		return;
 
-	em = p->p_p->ps_emul;
+	pr = p->p_p;
+	em = pr->ps_emul;
 	sy = &em->e_sysent[code];
 	if (!(scdebug & SCDEBUG_ALL || code < 0 || code >= em->e_nsysent ||
 	     sy->sy_call == sys_nosys))
 		return;
-		
-	printf("proc %d (%s): %s num ", p->p_p->ps_pid, p->p_comm, em->e_name);
+
+	printf("proc %d (%s): %s num ", pr->ps_pid, pr->ps_comm, em->e_name);
 	if (code < 0 || code >= em->e_nsysent)
 		printf("OUT OF RANGE (%ld)", code);
 	else {
@@ -127,19 +129,21 @@ void
 scdebug_ret(struct proc *p, register_t code, int error,
     const register_t retval[])
 {
+	struct process *pr;
 	struct sysent *sy;
 	struct emul *em;
 
 	if (!(scdebug & SCDEBUG_RETURNS))
 		return;
 
-	em = p->p_p->ps_emul;
+	pr = p->p_p;
+	em = pr->ps_emul;
 	sy = &em->e_sysent[code];
 	if (!(scdebug & SCDEBUG_ALL || code < 0 || code >= em->e_nsysent ||
 	    sy->sy_call == sys_nosys))
 		return;
 		
-	printf("proc %d (%s): %s num ", p->p_p->ps_pid, p->p_comm, em->e_name);
+	printf("proc %d (%s): %s num ", pr->ps_pid, pr->ps_comm, em->e_name);
 	if (code < 0 || code >= em->e_nsysent)
 		printf("OUT OF RANGE (%ld)", code);
 	else
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 14b2ab76317..5f965301144 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.c,v 1.132 2016/07/10 00:39:31 millert Exp $	*/
+/*	$OpenBSD: tty.c,v 1.133 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $	*/
 
 /*-
@@ -2255,7 +2255,7 @@ update_pick:
 
 		ttyprintf(tp,
 		    " cmd: %s %d [%s] %lld.%02ldu %lld.%02lds %d%% %ldk\n",
-		    pick->p_comm, pickpr->ps_pid, state,
+		    pickpr->ps_comm, pickpr->ps_pid, state,
 		    (long long)utime.tv_sec, utime.tv_nsec / 10000000,
 		    (long long)stime.tv_sec, stime.tv_nsec / 10000000,
 		    calc_pctcpu / 100, rss);
diff --git a/sys/sys/exec_elf.h b/sys/sys/exec_elf.h
index 7c400111abf..f075a9c871d 100644
--- a/sys/sys/exec_elf.h
+++ b/sys/sys/exec_elf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.h,v 1.65 2016/11/28 21:50:12 patrick Exp $	*/
+/*	$OpenBSD: exec_elf.h,v 1.66 2017/01/21 05:42:03 guenther Exp $	*/
 /*
  * Copyright (c) 1995, 1996 Erik Theisen.  All rights reserved.
  *
@@ -601,7 +601,7 @@ struct elfcore_procinfo {
 	uint32_t	cpi_rgid;	/* real group ID */
 	uint32_t	cpi_egid;	/* effective group ID */
 	uint32_t	cpi_svgid;	/* saved group ID */
-	int8_t		cpi_name[32];	/* copy of p->p_comm */
+	int8_t		cpi_name[32];	/* copy of pr->ps_comm */
 };
 
 /*
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 8e73aab84b3..66c6ff522a5 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.228 2016/11/07 02:50:33 guenther Exp $	*/
+/*	$OpenBSD: proc.h,v 1.229 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $	*/
 
 /*-
@@ -207,6 +207,9 @@ struct process {
 	struct	plimit *ps_limit;	/* Process limits. */
 	struct	pgrp *ps_pgrp;		/* Pointer to process group. */
 	struct	emul *ps_emul;		/* Emulation information */
+
+	char	ps_comm[MAXCOMLEN+1];
+
 	vaddr_t	ps_strings;		/* User pointers to argv/env */
 	vaddr_t	ps_stackgap;		/* User pointer to the "stackgap" */
 	vaddr_t	ps_sigcode;		/* User pointer to the signal code */
@@ -334,8 +337,6 @@ struct proc {
 
 	u_char	p_priority;	/* Process priority. */
 	u_char	p_usrpri;	/* User-priority based on p_estcpu and ps_nice. */
-	char	p_comm[MAXCOMLEN+1];
-
 	int	p_pledge_syscall;	/* Cache of current syscall */
 
 #ifndef	__HAVE_MD_TCB
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index b701311df72..51ea2510a7a 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysctl.h,v 1.170 2016/11/07 00:26:32 guenther Exp $	*/
+/*	$OpenBSD: sysctl.h,v 1.171 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $	*/
 
 /*
@@ -577,7 +577,7 @@ do {									\
 	/* XXX depends on e_name being an array and not a pointer */	\
 	copy_str((kp)->p_emul, (char *)(pr)->ps_emul +			\
 	    offsetof(struct emul, e_name), sizeof((kp)->p_emul));	\
-	strlcpy((kp)->p_comm, (p)->p_comm, sizeof((kp)->p_comm));	\
+	strlcpy((kp)->p_comm, (pr)->ps_comm, sizeof((kp)->p_comm));	\
 	strlcpy((kp)->p_login, (sess)->s_login,			\
 	    MIN(sizeof((kp)->p_login), sizeof((sess)->s_login)));	\
 									\
diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index 5eee33b976b..16c98a87f01 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_mmap.c,v 1.141 2016/10/05 02:31:53 guenther Exp $	*/
+/*	$OpenBSD: uvm_mmap.c,v 1.142 2017/01/21 05:42:03 guenther Exp $	*/
 /*	$NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -324,7 +324,7 @@ uvm_wxcheck(struct proc *p, char *call)
 	/* Report W^X failures, and potentially SIGABRT */
 	if (pr->ps_wxcounter++ == 0)
 		log(LOG_NOTICE, "%s(%d): %s W^X violation\n",
-		    p->p_comm, p->p_p->ps_pid, call);
+		    pr->ps_comm, pr->ps_pid, call);
 	if (uvm_wxabort) {
 		struct sigaction sa;
 
@@ -467,7 +467,7 @@ sys_mmap(struct proc *p, void *v, register_t *retval)
 			printf("WARNING: defaulted mmap() share type to"
 			    " %s (pid %d comm %s)\n",
 			    vp->v_type == VCHR ? "MAP_SHARED" : "MAP_PRIVATE",
-			    p->p_p->ps_pid, p->p_comm);
+			    p->p_p->ps_pid, p->p_p->ps_comm);
 #endif
 			if (vp->v_type == VCHR)
 				flags |= MAP_SHARED;	/* for a device */