From owner-p4-projects@FreeBSD.ORG  Tue Jun  4 22:31:42 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id BC032E2A; Tue,  4 Jun 2013 22:31:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7EB47E28
 for <perforce@freebsd.org>; Tue,  4 Jun 2013 22:31:42 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6E50F1FB6
 for <perforce@freebsd.org>; Tue,  4 Jun 2013 22:31:42 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r54MVgNV025633
 for <perforce@freebsd.org>; Tue, 4 Jun 2013 22:31:42 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r54MVgda025630
 for perforce@freebsd.org; Tue, 4 Jun 2013 22:31:42 GMT
 (envelope-from brooks@freebsd.org)
Date: Tue, 4 Jun 2013 22:31:42 GMT
Message-Id: <201306042231.r54MVgda025630@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 229385 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Jun 2013 22:31:43 -0000

http://p4web.freebsd.org/@@229385?ac=10

Change 229385 by brooks@brooks_zenith on 2013/06/04 22:31:25

	Pull in git change 7252814 which allows tesla_dtrace.c to build
	and reenable DTrace in the tesla kernel.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA#3 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#2 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/amd64/conf/TESLA#3 (text+ko) ====

@@ -2,5 +2,3 @@
 ident TESLA
 
 options TESLA
-nooptions KDTRACE_HOOKS
-

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_dtrace.c#2 (text+ko) ====

@@ -59,7 +59,7 @@
 new_instance(struct tesla_class *tcp, struct tesla_instance *tip)
 {
 
-	SDT_PROBE(tesla, kernel, assert, new_instance, tcp, tip, 0, 0, 0);
+	SDT_PROBE(tesla, kernel, notify, new_instance, tcp, tip, 0, 0, 0);
 }
 
 static void
@@ -80,7 +80,7 @@
 
 static void
 no_instance(struct tesla_class *tcp, const struct tesla_key *tkp,
-    const struct tesla_transitions *)
+    const struct tesla_transitions *ttp)
 {
 
 	SDT_PROBE(tesla, kernel, notify, no_instance, tcp, tkp, ttp, 0, 0);
@@ -101,12 +101,12 @@
 	SDT_PROBE(tesla, kernel, notify, accept, tcp, tip, 0, 0, 0);
 }
 
-struct tesla_event_handlers dtrace_handler = {
+struct tesla_event_handlers dtrace_handlers = {
 	.teh_init			= new_instance,
 	.teh_transition			= transition,
 	.teh_clone			= clone,
 	.teh_fail_no_instance		= no_instance,
-	.teh_fail_bad_transition	= bad_transition,
+	.teh_bad_transition		= bad_transition,
 	.teh_accept			= accept
 };