From owner-p4-projects@FreeBSD.ORG  Fri Jul  7 19:02:09 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B7C216A4DE; Fri,  7 Jul 2006 19:02:09 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2752A16A4DA
	for <perforce@freebsd.org>; Fri,  7 Jul 2006 19:02:09 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8635A43D58
	for <perforce@freebsd.org>; Fri,  7 Jul 2006 19:02:08 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k67J28Pu061116
	for <perforce@freebsd.org>; Fri, 7 Jul 2006 19:02:08 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k67J28fl061113
	for perforce@freebsd.org; Fri, 7 Jul 2006 19:02:08 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 7 Jul 2006 19:02:08 GMT
Message-Id: <200607071902.k67J28fl061113@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100923 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Fri, 07 Jul 2006 19:02:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=100923

Change 100923 by jb@jb_freebsd2 on 2006/07/07 19:01:28

	Instruction size and disassembly functions are only required on i386.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#15 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#13 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#15 (text+ko) ====

@@ -27,8 +27,10 @@
 {
 	dtrace_provider_id_t id;
 
+#if defined(__i386__)
 	/* Hang our hook for DTrace traps during probes. */
 	dtrace_instr_size_func = dtrace_instr_size;
+#endif
 
 	/* Hang our hook for thread switches. */
 	dtrace_vtime_switch_func = dtrace_vtime_switch;

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#13 (text+ko) ====

@@ -161,9 +161,10 @@
 	dtrace_vtime_active = 0;
 	dtrace_vtime_switch_func = NULL;
 
+#if defined(__i386__)
 	/* Reset our hook for DTrace traps during probes. */
 	dtrace_instr_size_func = NULL;
-
+#endif
 
 	return (error);
 }