From owner-p4-projects@FreeBSD.ORG  Wed Aug  9 00:19:34 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 9698F16A4E1; Wed,  9 Aug 2006 00:19:34 +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 4E98D16A4DD
	for <perforce@FreeBSD.org>; Wed,  9 Aug 2006 00:19:34 +0000 (UTC)
	(envelope-from howardsu@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5865143D69
	for <perforce@FreeBSD.org>; Wed,  9 Aug 2006 00:19:33 +0000 (GMT)
	(envelope-from howardsu@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 k790JXo7068378
	for <perforce@FreeBSD.org>; Wed, 9 Aug 2006 00:19:33 GMT
	(envelope-from howardsu@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k790JWNu068375
	for perforce@freebsd.org; Wed, 9 Aug 2006 00:19:32 GMT
	(envelope-from howardsu@FreeBSD.org)
Date: Wed, 9 Aug 2006 00:19:32 GMT
Message-Id: <200608090019.k790JWNu068375@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	howardsu@FreeBSD.org using -f
From: Howard Su <howardsu@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 103479 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: Wed, 09 Aug 2006 00:19:34 -0000

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

Change 103479 by howardsu@su_vm on 2006/08/09 00:19:15

	Respect the KDTRACE opt flag. Mark SDT_XXX as nop when no KDTRACE

Affected files ...

.. //depot/projects/dtrace/src/sys/sys/sdt.h#6 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sys/sdt.h#6 (text+ko) ====

@@ -71,6 +71,7 @@
 
 #else /* _KERNEL */
 
+#ifdef KDTRACE
 #define __SDT_LABEL(name) \
 	__asm__(".globl __dtrace_probe_" #name); \
 	__asm__("__dtrace_probe_"#name ":")
@@ -108,7 +109,13 @@
 	    (uintptr_t)(arg3), (uintptr_t)(arg4));			\
 	__SDT_LABEL(name);								\
 }
-
+#else
+#define DTRACE_PROBE(name)
+#define DTRACE_PROBE1(name, type1, arg1)
+#define DTRACE_PROBE2(name, type1, arg1, type2, arg2)
+#define DTRACE_PROBE3(name, type1, arg1, type2, arg2, type3, arg3)
+#define DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4)
+#endif /* KDTRACE */
 #endif /* _KERNEL */
 
 extern const char *sdt_prefix;