From owner-svn-src-head@FreeBSD.ORG  Sun Aug 22 11:30:49 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6E253106564A;
	Sun, 22 Aug 2010 11:30:49 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5DC8E8FC17;
	Sun, 22 Aug 2010 11:30:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7MBUnNq002488;
	Sun, 22 Aug 2010 11:30:49 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7MBUnUu002486;
	Sun, 22 Aug 2010 11:30:49 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201008221130.o7MBUnUu002486@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sun, 22 Aug 2010 11:30:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211617 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Aug 2010 11:30:49 -0000

Author: rpaulo
Date: Sun Aug 22 11:30:49 2010
New Revision: 211617
URL: http://svn.freebsd.org/changeset/base/211617

Log:
  Call the systrace_probe_func() when the error value.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/kern/subr_trap.c

Modified: head/sys/kern/subr_trap.c
==============================================================================
--- head/sys/kern/subr_trap.c	Sun Aug 22 11:18:57 2010	(r211616)
+++ head/sys/kern/subr_trap.c	Sun Aug 22 11:30:49 2010	(r211617)
@@ -312,7 +312,7 @@ syscallenter(struct thread *td, struct s
 		 */
 		if (systrace_probe_func != NULL && sa->callp->sy_entry != 0)
 			(*systrace_probe_func)(sa->callp->sy_entry, sa->code,
-			    sa->callp, sa->args);
+			    sa->callp, sa->args, 0);
 #endif
 
 		AUDIT_SYSCALL_ENTER(sa->code, td);
@@ -330,7 +330,7 @@ syscallenter(struct thread *td, struct s
 		 */
 		if (systrace_probe_func != NULL && sa->callp->sy_return != 0)
 			(*systrace_probe_func)(sa->callp->sy_return, sa->code,
-			    sa->callp, sa->args);
+			    sa->callp, NULL, (error) ? -1 : td->td_retval[0]);
 #endif
 		syscall_thread_exit(td, sa->callp);
 		CTR4(KTR_SYSC, "syscall: p=%p error=%d return %#lx %#lx",