From owner-p4-projects@FreeBSD.ORG  Tue Aug  8 00:44:26 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 4D14116A4DF; Tue,  8 Aug 2006 00:44:26 +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 28CEB16A4DD
	for <perforce@freebsd.org>; Tue,  8 Aug 2006 00:44:26 +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 BD18F43D46
	for <perforce@freebsd.org>; Tue,  8 Aug 2006 00:44:25 +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 k780iPLN089224
	for <perforce@freebsd.org>; Tue, 8 Aug 2006 00:44:25 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k780iPkx089221
	for perforce@freebsd.org; Tue, 8 Aug 2006 00:44:25 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 8 Aug 2006 00:44:25 GMT
Message-Id: <200608080044.k780iPkx089221@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 103415 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: Tue, 08 Aug 2006 00:44:26 -0000

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

Change 103415 by jb@jb_freebsd2 on 2006/08/08 00:43:52

	Allow for the possibility that the KDTRACE option isn't defined. Of
	course it it isn't, then loading the dtrace module will fail, but 
	when building this module, the kernel options aren't known.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#32 edit

Differences ...

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

@@ -29,7 +29,9 @@
  * Use is subject to license terms.
  */
 
+#ifndef KDTRACE
 #define KDTRACE
+#endif
 
 /*
  * DTrace - Dynamic Tracing for Solaris