From owner-svn-src-all@FreeBSD.ORG Tue Jul 29 22:26:43 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8551D589; Tue, 29 Jul 2014 22:26:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72AB92EFC; Tue, 29 Jul 2014 22:26:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6TMQh03001519; Tue, 29 Jul 2014 22:26:43 GMT (envelope-from markj@svn.freebsd.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6TMQhk2001518; Tue, 29 Jul 2014 22:26:43 GMT (envelope-from markj@svn.freebsd.org) Message-Id: <201407292226.s6TMQhk2001518@svn.freebsd.org> From: Mark Johnston Date: Tue, 29 Jul 2014 22:26:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r269273 - stable/9/sys/cddl/dev/systrace X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jul 2014 22:26:43 -0000 Author: markj Date: Tue Jul 29 22:26:42 2014 New Revision: 269273 URL: http://svnweb.freebsd.org/changeset/base/269273 Log: MFC r264435: Ensure that all eight syscall arguments are available to dtrace_probe(), rather than just the first five. Modified: stable/9/sys/cddl/dev/systrace/systrace.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/cddl/dev/systrace/systrace.c ============================================================================== --- stable/9/sys/cddl/dev/systrace/systrace.c Tue Jul 29 22:26:41 2014 (r269272) +++ stable/9/sys/cddl/dev/systrace/systrace.c Tue Jul 29 22:26:42 2014 (r269273) @@ -168,6 +168,9 @@ static dtrace_pops_t systrace_pops = { static struct cdev *systrace_cdev; static dtrace_provider_id_t systrace_id; +typedef void (*systrace_dtrace_probe_t)(dtrace_id_t, uintptr_t, uintptr_t, + uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t); + #if !defined(LINUX_SYSTRACE) /* * Probe callback function. @@ -180,6 +183,7 @@ static void systrace_probe(u_int32_t id, int sysnum, struct sysent *sysent, void *params, int ret) { + systrace_dtrace_probe_t probe; int n_args = 0; u_int64_t uargs[8]; @@ -211,7 +215,9 @@ systrace_probe(u_int32_t id, int sysnum, } /* Process the probe using the converted argments. */ - dtrace_probe(id, uargs[0], uargs[1], uargs[2], uargs[3], uargs[4]); + probe = (systrace_dtrace_probe_t)dtrace_probe; + probe(id, uargs[0], uargs[1], uargs[2], uargs[3], uargs[4], uargs[5], + uargs[6], uargs[7]); } #endif