diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2014-03-26 05:23:43 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2014-03-26 05:23:43 +0000 |
| commit | 87c550209612d49384b0a8f1177ea278fc14bbc7 (patch) | |
| tree | b3a354d29c205e40b172f436bbd2f6299a6aef4f /sys/arch/powerpc | |
| parent | f11198840aef6a17a2ba3d8668ef653d8adb535f (diff) | |
Move p_emul and p_sigcode from proc to process.
Tweak the handling of ktrace EMUL when changing ktracing: only
generate one per process (not one per thread) and pass the correct
proc pointer down to the VFS layer. Permit generating of NAMI and
CSW records inside ktrace(2) itself.
ok deraadt@ millert@
Diffstat (limited to 'sys/arch/powerpc')
| -rw-r--r-- | sys/arch/powerpc/powerpc/trap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index 584c98fc2df..7d4e23d7222 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.94 2012/12/31 06:46:13 guenther Exp $ */ +/* $OpenBSD: trap.c,v 1.95 2014/03/26 05:23:42 guenther Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -402,8 +402,8 @@ printf("isi iar %x lr %x\n", frame->srr0, frame->lr); uvmexp.syscalls++; - nsys = p->p_emul->e_nsysent; - callp = p->p_emul->e_sysent; + nsys = p->p_p->ps_emul->e_nsysent; + callp = p->p_p->ps_emul->e_sysent; code = frame->fixreg[0]; params = frame->fixreg + FIRSTARG; @@ -431,7 +431,7 @@ printf("isi iar %x lr %x\n", frame->srr0, frame->lr); break; } if (code < 0 || code >= nsys) - callp += p->p_emul->e_nosys; + callp += p->p_p->ps_emul->e_nosys; else callp += code; argsize = callp->sy_argsize; |