diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2016-10-08 05:49:10 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2016-10-08 05:49:10 +0000 |
| commit | 29a294262159642c660004881afe5b4bbe97c353 (patch) | |
| tree | bf7375ba0b0e155f57b31b312ffbc267a9fc17b5 /sys/arch/alpha | |
| parent | fd60b00ccc9cd707e9e91296df00083e9a6b1ad9 (diff) | |
Various printf claim to report the PID, so actually report that and not the TID
Build testing assistance from deraadt@
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/alpha/interrupt.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/trap.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c index a5063c256d0..d179c1309df 100644 --- a/sys/arch/alpha/alpha/interrupt.c +++ b/sys/arch/alpha/alpha/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.38 2016/06/13 01:26:14 dlg Exp $ */ +/* $OpenBSD: interrupt.c,v 1.39 2016/10/08 05:49:08 guenther Exp $ */ /* $NetBSD: interrupt.c,v 1.46 2000/06/03 20:47:36 thorpej Exp $ */ /*- @@ -347,7 +347,7 @@ fatal: printf(" ra = 0x%lx\n", framep->tf_regs[FRAME_RA]); printf(" curproc = %p\n", curproc); if (curproc != NULL) - printf(" pid = %d, comm = %s\n", curproc->p_pid, + printf(" pid = %d, comm = %s\n", curproc->p_p->ps_pid, curproc->p_comm); printf("\n"); panic("machine check"); diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c index 4475f8a7ff1..abab88d9240 100644 --- a/sys/arch/alpha/alpha/trap.c +++ b/sys/arch/alpha/alpha/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.81 2016/03/30 15:39:46 afresh1 Exp $ */ +/* $OpenBSD: trap.c,v 1.82 2016/10/08 05:49:08 guenther Exp $ */ /* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */ /*- @@ -205,8 +205,8 @@ printtrap(const unsigned long a0, const unsigned long a1, printf(" ra = 0x%lx\n", framep->tf_regs[FRAME_RA]); printf(" curproc = %p\n", curproc); if (curproc != NULL) - printf(" pid = %d, comm = %s\n", curproc->p_pid, - curproc->p_comm); + printf(" pid = %d, comm = %s\n", + curproc->p_p->ps_pid, curproc->p_comm); printf("\n"); } @@ -459,8 +459,8 @@ do_fault: typ = SEGV_MAPERR; if (rv == ENOMEM) { printf("UVM: pid %u (%s), uid %d killed: " - "out of swap\n", p->p_pid, p->p_comm, - p->p_ucred ? (int)p->p_ucred->cr_uid : -1); + "out of swap\n", p->p_p->ps_pid, p->p_comm, + p->p_ucred ? (int)p->p_ucred->cr_uid : -1); i = SIGKILL; } else { i = SIGSEGV; @@ -982,7 +982,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_pid, p->p_comm, va, + p->p_p->ps_pid, p->p_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); |