Module Name: src
Committed By: matt
Date: Wed Jun 26 17:18:52 UTC 2013
Modified Files:
src/sys/arch/x86/x86: syscall.c
Log Message:
Use sy_invoke
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x86/x86/syscall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/syscall.c
diff -u src/sys/arch/x86/x86/syscall.c:1.11 src/sys/arch/x86/x86/syscall.c:1.12
--- src/sys/arch/x86/x86/syscall.c:1.11 Tue Jul 10 21:18:07 2012
+++ src/sys/arch/x86/x86/syscall.c Wed Jun 26 17:18:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.11 2012/07/10 21:18:07 dsl Exp $ */
+/* $NetBSD: syscall.c,v 1.12 2013/06/26 17:18:52 matt Exp $ */
/*-
* Copyright (c) 1998, 2000, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.11 2012/07/10 21:18:07 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.12 2013/06/26 17:18:52 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,18 +153,7 @@ syscall(struct trapframe *frame)
goto bad;
}
#endif
- if (!__predict_false(p->p_trace_enabled)
- || __predict_false(callp->sy_flags & SYCALL_INDIRECT)
- || (error = trace_enter(code, args, callp->sy_narg)) == 0) {
- rval[0] = 0;
- rval[1] = 0;
- error = sy_call(callp, l, args, rval);
- }
-
- if (__predict_false(p->p_trace_enabled)
- && !__predict_false(callp->sy_flags & SYCALL_INDIRECT)) {
- trace_exit(code, rval, error);
- }
+ error = sy_invoke(callp, l, args, rval, code);
if (__predict_true(error == 0)) {
X86_TF_RAX(frame) = rval[0];
