CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sat Mar  7 16:39:20 UTC 2015

Modified Files:
        src/sys/sys: syscall.h syscallargs.h syscallvar.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/sys/sys/syscall.h
cvs rdiff -u -r1.259 -r1.260 src/sys/sys/syscallargs.h
cvs rdiff -u -r1.9 -r1.10 src/sys/sys/syscallvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.276 src/sys/sys/syscall.h:1.277
--- src/sys/sys/syscall.h:1.276	Sat Feb 21 19:53:28 2015
+++ src/sys/sys/syscall.h	Sat Mar  7 11:39:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.h,v 1.276 2015/02/22 00:53:28 christos Exp $ */
+/* $NetBSD: syscall.h,v 1.277 2015/03/07 16:39:20 christos Exp $ */
 
 /*
  * System call numbers.

Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.259 src/sys/sys/syscallargs.h:1.260
--- src/sys/sys/syscallargs.h:1.259	Sat Feb 21 19:53:28 2015
+++ src/sys/sys/syscallargs.h	Sat Mar  7 11:39:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: syscallargs.h,v 1.259 2015/02/22 00:53:28 christos Exp $ */
+/* $NetBSD: syscallargs.h,v 1.260 2015/03/07 16:39:20 christos Exp $ */
 
 /*
  * System call argument lists.

Index: src/sys/sys/syscallvar.h
diff -u src/sys/sys/syscallvar.h:1.9 src/sys/sys/syscallvar.h:1.10
--- src/sys/sys/syscallvar.h:1.9	Mon Mar  3 22:24:03 2014
+++ src/sys/sys/syscallvar.h	Sat Mar  7 11:39:20 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscallvar.h,v 1.9 2014/03/04 03:24:03 matt Exp $	*/
+/*	$NetBSD: syscallvar.h,v 1.10 2015/03/07 16:39:20 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,6 +36,10 @@
 #error nothing of interest to userspace here
 #endif
 
+#if defined(_KERNEL) && defined(_KERNEL_OPT)
+#include "opt_dtrace.h"
+#endif
+
 #include <sys/systm.h>
 #include <sys/proc.h>
 
@@ -72,8 +76,13 @@ sy_invoke(const struct sysent *sy, struc
 	    (sy->sy_flags & SYCALL_INDIRECT) == 0;
 	int error;
 
-	if (__predict_true(!do_trace)
-	    || (error = trace_enter(code, uap, sy->sy_narg)) == 0) {
+#ifdef KDTRACE_HOOKS
+#define KDTRACE_ENTRY(a)	(a)
+#else
+#define KDTRACE_ENTRY(a)	(0)
+#endif
+	if (__predict_true(!(do_trace || KDTRACE_ENTRY(sy->sy_entry)))
+	    || (error = trace_enter(code, sy, uap)) == 0) {
 		rval[0] = 0;
 #if !defined(__mips__) && !defined(__m68k__)
 		/*
@@ -85,8 +94,8 @@ sy_invoke(const struct sysent *sy, struc
 		error = sy_call(sy, l, uap, rval);
 	}
 
-	if (__predict_false(do_trace)) {
-		trace_exit(code, rval, error);
+	if (__predict_false(do_trace || KDTRACE_ENTRY(sy->sy_return))) {
+		trace_exit(code, sy, uap, rval, error);
 	}
 	return error;
 }