From b8bcdbe9e657be833ffb59176a30596bc249eaaa Mon Sep 17 00:00:00 2001 From: dsl Date: Sat, 5 Jan 2008 12:53:52 +0000 Subject: Don't pass 'curlwp' into trace_enter() and trace_exit(). --- sys/arch/alpha/alpha/linux_syscall.c | 8 ++++---- sys/arch/alpha/alpha/osf1_syscall.c | 8 ++++---- sys/arch/alpha/alpha/syscall.c | 8 ++++---- sys/arch/amd64/amd64/linux32_syscall.c | 8 ++++---- sys/arch/amd64/amd64/linux_syscall.c | 8 ++++---- sys/arch/amd64/amd64/netbsd32_syscall.c | 8 ++++---- sys/arch/amd64/amd64/syscall.c | 8 ++++---- sys/arch/arm/arm/linux_syscall.c | 8 ++++---- sys/arch/arm/arm/syscall.c | 8 ++++---- sys/arch/hppa/hppa/trap.c | 8 ++++---- sys/arch/i386/i386/freebsd_syscall.c | 8 ++++---- sys/arch/i386/i386/ibcs2_syscall.c | 8 ++++---- sys/arch/i386/i386/linux_syscall.c | 8 ++++---- sys/arch/i386/i386/mach_syscall.c | 8 ++++---- sys/arch/i386/i386/svr4_syscall.c | 8 ++++---- sys/arch/i386/i386/syscall.c | 8 ++++---- sys/arch/m68k/m68k/linux_syscall.c | 8 ++++---- sys/arch/m68k/m68k/m68k_syscall.c | 8 ++++---- sys/arch/m68k/m68k/sunos_syscall.c | 8 ++++---- sys/arch/mips/mips/syscall.c | 8 ++++---- sys/arch/pc532/pc532/syscall.c | 8 ++++---- sys/arch/powerpc/powerpc/syscall.c | 8 ++++---- sys/arch/sh3/sh3/syscall.c | 6 +++--- sys/arch/sparc/sparc/syscall.c | 8 ++++---- sys/arch/sparc64/sparc64/syscall.c | 8 ++++---- sys/arch/vax/vax/syscall.c | 8 ++++---- sys/kern/kern_subr.c | 8 ++++---- sys/kern/sys_syscall.c | 8 ++++---- sys/sys/systm.h | 7 +++---- 29 files changed, 114 insertions(+), 115 deletions(-) (limited to 'sys') diff --git a/sys/arch/alpha/alpha/linux_syscall.c b/sys/arch/alpha/alpha/linux_syscall.c index 37ddbbb12fe..e4aecbf20e1 100644 --- a/sys/arch/alpha/alpha/linux_syscall.c +++ b/sys/arch/alpha/alpha/linux_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.c,v 1.22 2007/03/04 05:59:10 christos Exp $ */ +/* $NetBSD: linux_syscall.c,v 1.23 2008/01/05 12:53:52 dsl Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.22 2007/03/04 05:59:10 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.23 2008/01/05 12:53:52 dsl Exp $"); #include #include @@ -296,7 +296,7 @@ linux_syscall_fancy(struct lwp *l, u_int64_t code, struct trapframe *framep) args += hidden; - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -324,7 +324,7 @@ out: KERNEL_UNLOCK_LAST(l); - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/alpha/alpha/osf1_syscall.c b/sys/arch/alpha/alpha/osf1_syscall.c index 2c87db29dff..41d3e68877b 100644 --- a/sys/arch/alpha/alpha/osf1_syscall.c +++ b/sys/arch/alpha/alpha/osf1_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_syscall.c,v 1.24 2007/03/04 05:59:10 christos Exp $ */ +/* $NetBSD: osf1_syscall.c,v 1.25 2008/01/05 12:53:52 dsl Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: osf1_syscall.c,v 1.24 2007/03/04 05:59:10 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_syscall.c,v 1.25 2008/01/05 12:53:52 dsl Exp $"); #include #include @@ -292,7 +292,7 @@ osf1_syscall_fancy(struct lwp *l, u_int64_t code, struct trapframe *framep) } args += hidden; - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -320,7 +320,7 @@ out: KERNEL_UNLOCK_LAST(l); - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/alpha/alpha/syscall.c b/sys/arch/alpha/alpha/syscall.c index 718754e17fc..96f3138091c 100644 --- a/sys/arch/alpha/alpha/syscall.c +++ b/sys/arch/alpha/alpha/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.28 2007/10/17 19:52:56 garbled Exp $ */ +/* $NetBSD: syscall.c,v 1.29 2008/01/05 12:53:52 dsl Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.28 2007/10/17 19:52:56 garbled Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.29 2008/01/05 12:53:52 dsl Exp $"); #include #include @@ -302,7 +302,7 @@ syscall_fancy(struct lwp *l, u_int64_t code, struct trapframe *framep) } args += hidden; - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -328,7 +328,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/amd64/amd64/linux32_syscall.c b/sys/arch/amd64/amd64/linux32_syscall.c index d9f70bce9f5..bc1a9591a14 100644 --- a/sys/arch/amd64/amd64/linux32_syscall.c +++ b/sys/arch/amd64/amd64/linux32_syscall.c @@ -1,7 +1,7 @@ -/* $NetBSD: linux32_syscall.c,v 1.18 2007/12/31 15:31:46 ad Exp $ */ +/* $NetBSD: linux32_syscall.c,v 1.19 2008/01/05 12:53:55 dsl Exp $ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux32_syscall.c,v 1.18 2007/12/31 15:31:46 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_syscall.c,v 1.19 2008/01/05 12:53:55 dsl Exp $"); #include #include @@ -76,7 +76,7 @@ linux32_syscall(frame) code, argsize); for (i = 0; i < (argsize >> 2); i++) args64[i] = args[i] & 0xffffffff; - if ((error = trace_enter(l, code, code, NULL, args64)) != 0) + if ((error = trace_enter(code, code, NULL, args64)) != 0) goto out; } @@ -110,6 +110,6 @@ out: } if (__predict_false(p->p_trace_enabled)) - trace_exit(l, code, args64, rval, error); + trace_exit(code, args64, rval, error); userret(l); } diff --git a/sys/arch/amd64/amd64/linux_syscall.c b/sys/arch/amd64/amd64/linux_syscall.c index 993857516b4..94b0b68e325 100644 --- a/sys/arch/amd64/amd64/linux_syscall.c +++ b/sys/arch/amd64/amd64/linux_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.c,v 1.19 2008/01/05 12:08:50 dsl Exp $ */ +/* $NetBSD: linux_syscall.c,v 1.20 2008/01/05 12:53:55 dsl Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.19 2008/01/05 12:08:50 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.20 2008/01/05 12:53:55 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_linux.h" @@ -111,7 +111,7 @@ linux_syscall(struct trapframe *frame) KERNEL_LOCK(1, l); if (__predict_false(p->p_trace_enabled) - && (error = trace_enter(l, code, code, NULL, args)) != 0) + && (error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -141,7 +141,7 @@ out: } if (__predict_false(p->p_trace_enabled)) - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/amd64/amd64/netbsd32_syscall.c b/sys/arch/amd64/amd64/netbsd32_syscall.c index b6c6f56ed03..77caf3d671d 100644 --- a/sys/arch/amd64/amd64/netbsd32_syscall.c +++ b/sys/arch/amd64/amd64/netbsd32_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_syscall.c,v 1.22 2007/12/31 15:31:46 ad Exp $ */ +/* $NetBSD: netbsd32_syscall.c,v 1.23 2008/01/05 12:53:55 dsl Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscall.c,v 1.22 2007/12/31 15:31:46 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscall.c,v 1.23 2008/01/05 12:53:55 dsl Exp $"); #include #include @@ -106,7 +106,7 @@ netbsd32_syscall(struct trapframe *frame) int narg = callp->sy_argsize >> 2; for (i = 0; i < narg; i++) args64[i] = args[i]; - error = trace_enter(l, code, code, NULL, args64); + error = trace_enter(code, code, NULL, args64); if (__predict_false(error != 0)) goto out; } @@ -126,7 +126,7 @@ out: && !__predict_false(callp->sy_flags & SYCALL_INDIRECT)) { /* Recover 'code' - the compiler doesn't assign it a register */ code = frame->tf_rax & (SYS_NSYSENT - 1); - trace_exit(l, code, args64, rval, error); + trace_exit(code, args64, rval, error); } if (__predict_true(error == 0)) { diff --git a/sys/arch/amd64/amd64/syscall.c b/sys/arch/amd64/amd64/syscall.c index bdded322da6..a8daaad0e7b 100644 --- a/sys/arch/amd64/amd64/syscall.c +++ b/sys/arch/amd64/amd64/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.35 2008/01/05 12:08:50 dsl Exp $ */ +/* $NetBSD: syscall.c,v 1.36 2008/01/05 12:53:55 dsl Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.35 2008/01/05 12:08:50 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.36 2008/01/05 12:53:55 dsl Exp $"); #include #include @@ -128,7 +128,7 @@ syscall(struct trapframe *frame) if (!__predict_false(p->p_trace_enabled) || __predict_false(callp->sy_flags & SYCALL_INDIRECT) - || (error = trace_enter(l, code, code, NULL, args)) == 0) { + || (error = trace_enter(code, code, NULL, args)) == 0) { rval[0] = 0; rval[1] = 0; @@ -144,7 +144,7 @@ syscall(struct trapframe *frame) if (__predict_false(p->p_trace_enabled) && !__predict_false(callp->sy_flags & SYCALL_INDIRECT)) { code = frame->tf_rax & (SYS_NSYSENT - 1); - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); } if (__predict_true(error == 0)) { diff --git a/sys/arch/arm/arm/linux_syscall.c b/sys/arch/arm/arm/linux_syscall.c index d3ebb6f5c4c..8cee6ee868e 100644 --- a/sys/arch/arm/arm/linux_syscall.c +++ b/sys/arch/arm/arm/linux_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.c,v 1.18 2006/03/07 07:21:50 thorpej Exp $ */ +/* $NetBSD: linux_syscall.c,v 1.19 2008/01/05 12:53:53 dsl Exp $ */ /*- * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc. @@ -76,7 +76,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.18 2006/03/07 07:21:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.19 2008/01/05 12:53:53 dsl Exp $"); #include #include @@ -181,7 +181,7 @@ linux_syscall_fancy(trapframe_t *frame, struct lwp *l, u_int32_t insn) callp = p->p_emul->e_sysent + code; nargs = callp->sy_argsize / sizeof(register_t); - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -208,7 +208,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/arm/arm/syscall.c b/sys/arch/arm/arm/syscall.c index d42cbb23525..fa99cebace9 100644 --- a/sys/arch/arm/arm/syscall.c +++ b/sys/arch/arm/arm/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.37 2007/10/17 19:53:30 garbled Exp $ */ +/* $NetBSD: syscall.c,v 1.38 2008/01/05 12:53:53 dsl Exp $ */ /*- * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37 2007/10/17 19:53:30 garbled Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.38 2008/01/05 12:53:53 dsl Exp $"); #include #include @@ -461,7 +461,7 @@ syscall_fancy(struct trapframe *frame, struct lwp *l, u_int32_t insn) goto bad; } - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -507,7 +507,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); KERNEL_UNLOCK_LAST(l); userret(l); } diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c index 8e5c7b1b96d..595d60131c0 100644 --- a/sys/arch/hppa/hppa/trap.c +++ b/sys/arch/hppa/hppa/trap.c @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.49 2007/11/05 20:43:02 ad Exp $ */ +/* $NetBSD: trap.c,v 1.50 2008/01/05 12:53:55 dsl Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.49 2007/11/05 20:43:02 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.50 2008/01/05 12:53:55 dsl Exp $"); /* #define INTRDEBUG */ /* #define TRAPDEBUG */ @@ -1149,7 +1149,7 @@ syscall(struct trapframe *frame, int *args) callp += code; argsize = callp->sy_argsize; - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -1196,7 +1196,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l, frame->tf_iioq_head, 0); #ifdef DEBUG diff --git a/sys/arch/i386/i386/freebsd_syscall.c b/sys/arch/i386/i386/freebsd_syscall.c index d26f3d1dd6c..e336dc62326 100644 --- a/sys/arch/i386/i386/freebsd_syscall.c +++ b/sys/arch/i386/i386/freebsd_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_syscall.c,v 1.27 2007/03/04 05:59:57 christos Exp $ */ +/* $NetBSD: freebsd_syscall.c,v 1.28 2008/01/05 12:53:53 dsl Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.27 2007/03/04 05:59:57 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.28 2008/01/05 12:53:53 dsl Exp $"); #include #include @@ -210,7 +210,7 @@ freebsd_syscall_fancy(frame) } KERNEL_LOCK(1, l); - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -242,7 +242,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/i386/i386/ibcs2_syscall.c b/sys/arch/i386/i386/ibcs2_syscall.c index 1892ffe634c..ee4dc7b55fc 100644 --- a/sys/arch/i386/i386/ibcs2_syscall.c +++ b/sys/arch/i386/i386/ibcs2_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_syscall.c,v 1.36 2007/03/04 05:59:57 christos Exp $ */ +/* $NetBSD: ibcs2_syscall.c,v 1.37 2008/01/05 12:53:53 dsl Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ibcs2_syscall.c,v 1.36 2007/03/04 05:59:57 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_syscall.c,v 1.37 2008/01/05 12:53:53 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_vm86.h" @@ -205,7 +205,7 @@ ibcs2_syscall_fancy(frame) } KERNEL_LOCK(1, l); - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -238,7 +238,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/i386/i386/linux_syscall.c b/sys/arch/i386/i386/linux_syscall.c index 364ad5f7c21..9cd85f439e5 100644 --- a/sys/arch/i386/i386/linux_syscall.c +++ b/sys/arch/i386/i386/linux_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.c,v 1.40 2007/12/20 22:16:50 dsl Exp $ */ +/* $NetBSD: linux_syscall.c,v 1.41 2008/01/05 12:53:53 dsl Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.40 2007/12/20 22:16:50 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.41 2008/01/05 12:53:53 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_vm86.h" @@ -111,11 +111,11 @@ linux_syscall(struct trapframe *frame) KERNEL_LOCK(1, l); if (__predict_false(l->l_proc->p_trace_enabled)) { - error = trace_enter(l, code, code, NULL, args); + error = trace_enter(code, code, NULL, args); if (__predict_true(error == 0)) { error = (*callp->sy_call)(l, args, rval); code = frame->tf_eax & (LINUX_SYS_NSYSENT - 1); - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); } } else error = (*callp->sy_call)(l, args, rval); diff --git a/sys/arch/i386/i386/mach_syscall.c b/sys/arch/i386/i386/mach_syscall.c index 22c629bba06..1b3cd85f3a9 100644 --- a/sys/arch/i386/i386/mach_syscall.c +++ b/sys/arch/i386/i386/mach_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_syscall.c,v 1.25 2007/12/11 09:26:11 dogcow Exp $ */ +/* $NetBSD: mach_syscall.c,v 1.26 2008/01/05 12:53:53 dsl Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mach_syscall.c,v 1.25 2007/12/11 09:26:11 dogcow Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_syscall.c,v 1.26 2008/01/05 12:53:53 dsl Exp $"); #include "opt_vm86.h" @@ -225,7 +225,7 @@ mach_syscall_fancy(frame) goto bad; } - if ((error = trace_enter(l, code, realcode, callp - code, args)) != 0) + if ((error = trace_enter(code, realcode, callp - code, args)) != 0) goto out; rval[0] = 0; @@ -256,7 +256,7 @@ out: break; } - trace_exit(l, realcode, args, rval, error); + trace_exit(realcode, args, rval, error); userret(l); } diff --git a/sys/arch/i386/i386/svr4_syscall.c b/sys/arch/i386/i386/svr4_syscall.c index 175238bf880..d89d5b8660c 100644 --- a/sys/arch/i386/i386/svr4_syscall.c +++ b/sys/arch/i386/i386/svr4_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_syscall.c,v 1.35 2007/03/04 05:59:57 christos Exp $ */ +/* $NetBSD: svr4_syscall.c,v 1.36 2008/01/05 12:53:53 dsl Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: svr4_syscall.c,v 1.35 2007/03/04 05:59:57 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_syscall.c,v 1.36 2008/01/05 12:53:53 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_vm86.h" @@ -200,7 +200,7 @@ svr4_syscall_fancy(frame) } KERNEL_LOCK(1, l); - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -233,7 +233,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/i386/i386/syscall.c b/sys/arch/i386/i386/syscall.c index 4427382158c..acc68b3b9e4 100644 --- a/sys/arch/i386/i386/syscall.c +++ b/sys/arch/i386/i386/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.48 2007/11/17 19:48:40 dsl Exp $ */ +/* $NetBSD: syscall.c,v 1.49 2008/01/05 12:53:53 dsl Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.48 2007/11/17 19:48:40 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.49 2008/01/05 12:53:53 dsl Exp $"); #include "opt_vm86.h" @@ -103,7 +103,7 @@ syscall(struct trapframe *frame) if (!__predict_false(l->l_proc->p_trace_enabled) || __predict_false(callp->sy_flags & SYCALL_INDIRECT) - || (error = trace_enter(l, frame->tf_eax & (SYS_NSYSENT - 1), + || (error = trace_enter(frame->tf_eax & (SYS_NSYSENT - 1), frame->tf_eax & (SYS_NSYSENT - 1), NULL, args)) == 0) { rval[0] = 0; rval[1] = 0; @@ -122,7 +122,7 @@ syscall(struct trapframe *frame) if (__predict_false(l->l_proc->p_trace_enabled) && !__predict_false(callp->sy_flags & SYCALL_INDIRECT)) { code = frame->tf_eax & (SYS_NSYSENT - 1); - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); } if (__predict_true(error == 0)) { diff --git a/sys/arch/m68k/m68k/linux_syscall.c b/sys/arch/m68k/m68k/linux_syscall.c index 1ec5730e380..463be833cb8 100644 --- a/sys/arch/m68k/m68k/linux_syscall.c +++ b/sys/arch/m68k/m68k/linux_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.c,v 1.16 2007/03/04 11:59:16 tsutsui Exp $ */ +/* $NetBSD: linux_syscall.c,v 1.17 2008/01/05 12:53:53 dsl Exp $ */ /*- * Portions Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -110,7 +110,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.16 2007/03/04 11:59:16 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.17 2008/01/05 12:53:53 dsl Exp $"); #include "opt_execfmt.h" @@ -263,7 +263,7 @@ linux_syscall_fancy(register_t code, struct lwp *l, struct frame *frame) break; } - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -299,5 +299,5 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); } diff --git a/sys/arch/m68k/m68k/m68k_syscall.c b/sys/arch/m68k/m68k/m68k_syscall.c index ceadf4c545c..ce255b43165 100644 --- a/sys/arch/m68k/m68k/m68k_syscall.c +++ b/sys/arch/m68k/m68k/m68k_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: m68k_syscall.c,v 1.32 2007/12/31 13:38:51 ad Exp $ */ +/* $NetBSD: m68k_syscall.c,v 1.33 2008/01/05 12:53:53 dsl Exp $ */ /*- * Portions Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -110,7 +110,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: m68k_syscall.c,v 1.32 2007/12/31 13:38:51 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: m68k_syscall.c,v 1.33 2008/01/05 12:53:53 dsl Exp $"); #include "opt_execfmt.h" #include "opt_compat_netbsd.h" @@ -380,7 +380,7 @@ syscall_fancy(register_t code, struct lwp *l, struct frame *frame) goto bad; } - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -436,7 +436,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); } void diff --git a/sys/arch/m68k/m68k/sunos_syscall.c b/sys/arch/m68k/m68k/sunos_syscall.c index faac43aa992..32e1728b2b1 100644 --- a/sys/arch/m68k/m68k/sunos_syscall.c +++ b/sys/arch/m68k/m68k/sunos_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunos_syscall.c,v 1.16 2007/03/04 11:18:25 tsutsui Exp $ */ +/* $NetBSD: sunos_syscall.c,v 1.17 2008/01/05 12:53:53 dsl Exp $ */ /*- * Portions Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -110,7 +110,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sunos_syscall.c,v 1.16 2007/03/04 11:18:25 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos_syscall.c,v 1.17 2008/01/05 12:53:53 dsl Exp $"); #include "opt_execfmt.h" @@ -316,7 +316,7 @@ sunos_syscall_fancy(register_t code, struct lwp *l, struct frame *frame) goto bad; } - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -358,5 +358,5 @@ out: frame->f_regs[SP] -= sizeof (int); } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); } diff --git a/sys/arch/mips/mips/syscall.c b/sys/arch/mips/mips/syscall.c index 4d9b3777afe..f6eea4feff5 100644 --- a/sys/arch/mips/mips/syscall.c +++ b/sys/arch/mips/mips/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.31 2007/02/09 21:55:06 ad Exp $ */ +/* $NetBSD: syscall.c,v 1.32 2008/01/05 12:53:54 dsl Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -114,7 +114,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.31 2007/02/09 21:55:06 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.32 2008/01/05 12:53:54 dsl Exp $"); #include #include @@ -414,7 +414,7 @@ EMULNAME(syscall_fancy)(struct lwp *l, u_int status, u_int cause, u_int opc) break; } - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; #if !defined(_MIPS_BSD_API) || _MIPS_BSD_API == _MIPS_BSD_API_LP32 @@ -452,7 +452,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/pc532/pc532/syscall.c b/sys/arch/pc532/pc532/syscall.c index b8512916dc1..0f98a873c21 100644 --- a/sys/arch/pc532/pc532/syscall.c +++ b/sys/arch/pc532/pc532/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.4 2007/03/04 06:00:29 christos Exp $ */ +/* $NetBSD: syscall.c,v 1.5 2008/01/05 12:53:54 dsl Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.4 2007/03/04 06:00:29 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.5 2008/01/05 12:53:54 dsl Exp $"); #include #include @@ -279,7 +279,7 @@ syscall_fancy(struct syscframe frame) goto bad; } - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -316,7 +316,7 @@ out: break; } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l, frame.sf_regs.r_pc, sticks); } diff --git a/sys/arch/powerpc/powerpc/syscall.c b/sys/arch/powerpc/powerpc/syscall.c index 3165a081879..28ea5b0c9a0 100644 --- a/sys/arch/powerpc/powerpc/syscall.c +++ b/sys/arch/powerpc/powerpc/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.37 2008/01/02 11:48:27 ad Exp $ */ +/* $NetBSD: syscall.c,v 1.38 2008/01/05 12:53:54 dsl Exp $ */ /* * Copyright (C) 2002 Matt Thomas @@ -60,7 +60,7 @@ #define EMULNAME(x) (x) #define EMULNAMEU(x) (x) -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37 2008/01/02 11:48:27 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.38 2008/01/05 12:53:54 dsl Exp $"); void child_return(void *arg) @@ -257,7 +257,7 @@ EMULNAME(syscall_fancy)(struct trapframe *frame) params = args; } - if ((error = trace_enter(l, code, realcode, callp - code, params)) != 0) + if ((error = trace_enter(code, realcode, callp - code, params)) != 0) goto out; rval[0] = 0; @@ -298,7 +298,7 @@ out: break; } KERNEL_UNLOCK_LAST(l); - trace_exit(l, realcode, params, rval, error); + trace_exit(realcode, params, rval, error); userret(l, frame); } diff --git a/sys/arch/sh3/sh3/syscall.c b/sys/arch/sh3/sh3/syscall.c index ec8f154d467..1b44f4a60bf 100644 --- a/sys/arch/sh3/sh3/syscall.c +++ b/sys/arch/sh3/sh3/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.8 2007/03/04 06:00:41 christos Exp $ */ +/* $NetBSD: syscall.c,v 1.9 2008/01/05 12:53:54 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved. @@ -338,7 +338,7 @@ syscall_fancy(struct lwp *l, struct trapframe *tf) if (error) goto bad; - if ((error = trace_enter(l, code, code, NULL, args)) != 0) + if ((error = trace_enter(code, code, NULL, args)) != 0) goto out; rval[0] = 0; @@ -371,7 +371,7 @@ out: } - trace_exit(l, code, args, rval, error); + trace_exit(code, args, rval, error); userret(l); } diff --git a/sys/arch/sparc/sparc/syscall.c b/sys/arch/sparc/sparc/syscall.c index 916b4fd6fb6..885267f3c57 100644 --- a/sys/arch/sparc/sparc/syscall.c +++ b/sys/arch/sparc/sparc/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.15 2007/10/17 19:57:15 garbled Exp $ */ +/* $NetBSD: syscall.c,v 1.16 2008/01/05 12:53:54 dsl Exp $ */ /* * Copyright (c) 1996 @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.15 2007/10/17 19:57:15 garbled Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.16 2008/01/05 12:53:54 dsl Exp $"); #include "opt_sparc_arch.h" #include "opt_multiprocessor.h" @@ -311,7 +311,7 @@ syscall_fancy(register_t code, struct trapframe *tf, register_t pc) goto bad; KERNEL_LOCK(1, l); - if ((error = trace_enter(l, code, code, NULL, args.i)) != 0) { + if ((error = trace_enter(code, code, NULL, args.i)) != 0) { KERNEL_UNLOCK_LAST(l); goto out; } @@ -367,7 +367,7 @@ out: break; } - trace_exit(l, code, args.i, rval.o, error); + trace_exit(code, args.i, rval.o, error); userret(l, pc, sticks); share_fpu(l, tf); diff --git a/sys/arch/sparc64/sparc64/syscall.c b/sys/arch/sparc64/sparc64/syscall.c index 998eeade5da..294ce0e6554 100644 --- a/sys/arch/sparc64/sparc64/syscall.c +++ b/sys/arch/sparc64/sparc64/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.22 2007/10/17 19:57:32 garbled Exp $ */ +/* $NetBSD: syscall.c,v 1.23 2008/01/05 12:53:54 dsl Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -86,7 +86,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.22 2007/10/17 19:57:32 garbled Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.23 2008/01/05 12:53:54 dsl Exp $"); #define NEW_FPSTATE @@ -413,7 +413,7 @@ syscall_fancy(struct trapframe64 *tf, register_t code, register_t pc) ap = &args; #endif KERNEL_LOCK(1, l); - if ((error = trace_enter(l, code, code, NULL, ap->r)) != 0) { + if ((error = trace_enter(code, code, NULL, ap->r)) != 0) { KERNEL_UNLOCK_LAST(l); goto out; } @@ -467,7 +467,7 @@ out: } if (ap) - trace_exit(l, code, ap->r, rval, error); + trace_exit(code, ap->r, rval, error); userret(l, pc, sticks); share_fpu(l, tf); diff --git a/sys/arch/vax/vax/syscall.c b/sys/arch/vax/vax/syscall.c index a92a3eac7bc..57dd651cd4e 100644 --- a/sys/arch/vax/vax/syscall.c +++ b/sys/arch/vax/vax/syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.7 2007/10/17 19:58:00 garbled Exp $ */ +/* $NetBSD: syscall.c,v 1.8 2008/01/05 12:53:55 dsl Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -33,7 +33,7 @@ /* All bugs are subject to removal without further notice */ #include -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.7 2007/10/17 19:58:00 garbled Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.8 2008/01/05 12:53:55 dsl Exp $"); #include "opt_multiprocessor.h" @@ -203,7 +203,7 @@ syscall_fancy(struct trapframe *frame) } KERNEL_LOCK(1, l); - if ((err = trace_enter(l, frame->code, frame->code, NULL, args)) != 0) + if ((err = trace_enter(frame->code, frame->code, NULL, args)) != 0) goto out; if ((callp->sy_flags & SYCALL_MPSAFE) == 0) { @@ -239,7 +239,7 @@ bad: break; } - trace_exit(l, frame->code, args, rval, err); + trace_exit(frame->code, args, rval, err); userret(l, frame, oticks); } diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 79d67cfd129..75bc36a3c0f 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_subr.c,v 1.172 2008/01/05 12:41:43 dsl Exp $ */ +/* $NetBSD: kern_subr.c,v 1.173 2008/01/05 12:53:55 dsl Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2006 The NetBSD Foundation, Inc. @@ -86,7 +86,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.172 2008/01/05 12:41:43 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.173 2008/01/05 12:53:55 dsl Exp $"); #include "opt_ddb.h" #include "opt_md.h" @@ -1359,7 +1359,7 @@ trace_is_enabled(struct proc *p) * system call number range for emulation the process runs under. */ int -trace_enter(struct lwp *l, register_t code, register_t realcode, +trace_enter(register_t code, register_t realcode, const struct sysent *callp, const register_t *args) { #ifdef SYSCALL_DEBUG @@ -1384,7 +1384,7 @@ trace_enter(struct lwp *l, register_t code, register_t realcode, * system call number range for emulation the process runs under. */ void -trace_exit(struct lwp *l, register_t code, const register_t *args, +trace_exit(register_t code, const register_t *args, register_t rval[], int error) { #ifdef SYSCALL_DEBUG diff --git a/sys/kern/sys_syscall.c b/sys/kern/sys_syscall.c index dacf7bf4728..b60ea3d60ca 100644 --- a/sys/kern/sys_syscall.c +++ b/sys/kern/sys_syscall.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_syscall.c,v 1.6 2007/12/31 15:32:13 ad Exp $ */ +/* $NetBSD: sys_syscall.c,v 1.7 2008/01/05 12:53:56 dsl Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_syscall.c,v 1.6 2007/12/31 15:32:13 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_syscall.c,v 1.7 2008/01/05 12:53:56 dsl Exp $"); #include @@ -84,11 +84,11 @@ SYS_SYSCALL(struct lwp *l, const struct CONCAT(SYS_SYSCALL, _args) *uap, args64[i] = SCARG(uap, args[i]); #endif - error = trace_enter(l, code, code, NULL, TRACE_ARGS); + error = trace_enter(code, code, NULL, TRACE_ARGS); if (__predict_false(error != 0)) return error; error = callp->sy_call(l, &uap->args, rval); - trace_exit(l, code, TRACE_ARGS, rval, error); + trace_exit(code, TRACE_ARGS, rval, error); return error; #undef TRACE_ARGS diff --git a/sys/sys/systm.h b/sys/sys/systm.h index d9c25e644aa..d0ab28c1b91 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $NetBSD: systm.h,v 1.208 2008/01/05 12:30:47 dsl Exp $ */ +/* $NetBSD: systm.h,v 1.209 2008/01/05 12:53:56 dsl Exp $ */ /*- * Copyright (c) 1982, 1988, 1991, 1993 @@ -371,10 +371,9 @@ void doforkhooks(struct proc *, struct proc *); */ #ifdef _KERNEL bool trace_is_enabled(struct proc *); -int trace_enter(struct lwp *, register_t, register_t, +int trace_enter(register_t, register_t, const struct sysent *, const register_t *); -void trace_exit(struct lwp *, register_t, const register_t *, - register_t [], int); +void trace_exit(register_t, const register_t *, register_t [], int); #endif int uiomove(void *, size_t, struct uio *); -- cgit