CVS commit: src/sys/arch/usermode/usermode

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Wed Jun 26 15:11:30 UTC 2013

Modified Files:
        src/sys/arch/usermode/usermode: syscall.c

Log Message:
Use sy_invoke


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/usermode/usermode/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/usermode/usermode/syscall.c
diff -u src/sys/arch/usermode/usermode/syscall.c:1.23 src/sys/arch/usermode/usermode/syscall.c:1.24
--- src/sys/arch/usermode/usermode/syscall.c:1.23	Mon Feb 13 19:15:59 2012
+++ src/sys/arch/usermode/usermode/syscall.c	Wed Jun 26 15:11:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.23 2012/02/13 19:15:59 reinoud Exp $ */
+/* $NetBSD: syscall.c,v 1.24 2013/06/26 15:11:30 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.23 2012/02/13 19:15:59 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.24 2013/06/26 15:11:30 matt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -131,16 +131,7 @@ syscall(void)
 	md_syscall_inc_pc(ucp, opcode);
 
 	if (!error) {
-		if (!__predict_false(p->p_trace_enabled)
-		    || __predict_false(callp->sy_flags & SYCALL_INDIRECT)
-		    || (error = trace_enter(code, args, callp->sy_narg)) == 0) {
-			error = (*callp->sy_call)(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);
 	}
 
 	syscall_retvals_print(l, curlwp, code, nargs, args, error, rval);