PERFORCE change 229385 for review

[Brooks Davis]

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

Change 229385 by brooks at 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
 };