diff options
| -rw-r--r-- | sys/arch/powerpc/powerpc/trap.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/vax/trap.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index d3038fb3cf9..b1cf43796a3 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.92 2012/08/07 17:17:46 guenther Exp $ */ +/* $OpenBSD: trap.c,v 1.93 2012/08/08 04:11:08 miod Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -397,7 +397,7 @@ printf("isi iar %x lr %x\n", frame->srr0, frame->lr); size_t argsize; register_t code, error; register_t *params, rval[2]; - int nsys, n, nolock; + int nsys, n; register_t args[10]; uvmexp.syscalls++; diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c index e1b7a49528f..6f4076188a8 100644 --- a/sys/arch/vax/vax/trap.c +++ b/sys/arch/vax/vax/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.45 2012/08/07 05:16:54 guenther Exp $ */ +/* $OpenBSD: trap.c,v 1.46 2012/08/08 04:11:09 miod Exp $ */ /* $NetBSD: trap.c,v 1.47 1999/08/21 19:26:20 matt Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -363,7 +363,7 @@ if(startsysc)printf("trap syscall %s pc %lx, psl %lx, sp %lx, pid %d, frame %p\n rval[0] = 0; rval[1] = frame->r1; if(callp->sy_narg) { - if ((error = copyin((char *)frame->ap + 4, args, + if ((err = copyin((char *)frame->ap + 4, args, callp->sy_argsize))) goto bad; } @@ -377,7 +377,6 @@ if(startsysc) curproc->p_pid,err,rval[0],rval[1],exptr); #endif -bad: switch (err) { case 0: exptr->r1 = rval[1]; |