From owner-freebsd-hackers@FreeBSD.ORG  Mon Jul  9 19:49:41 2012
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 98227106564A;
	Mon,  9 Jul 2012 19:49:41 +0000 (UTC)
	(envelope-from seanbru@yahoo-inc.com)
Received: from mrout1-b.corp.bf1.yahoo.com (mrout1-b.corp.bf1.yahoo.com
	[98.139.253.104])
	by mx1.freebsd.org (Postfix) with ESMTP id 522688FC18;
	Mon,  9 Jul 2012 19:49:41 +0000 (UTC)
Received: from [IPv6:::1] (rideseveral.corp.yahoo.com [10.73.160.231])
	by mrout1-b.corp.bf1.yahoo.com (8.14.4/8.14.4/y.out) with ESMTP id
	q69Jn1TQ054490; Mon, 9 Jul 2012 12:49:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yahoo-inc.com;
	s=cobra; t=1341863342;
	bh=AxtLJNvA0WVysac5Ib+9VPLStOupbO+JPaqOgLihJZ8=;
	h=Subject:From:Reply-To:To:Cc:Content-Type:Date:Message-ID:
	Mime-Version:Content-Transfer-Encoding;
	b=qzMG2O85dpQ9eWN2o3b6koaRkT611WUSOqG/yjhiWegs0LuaNRhNQ/7QH9BKXc7uB
	Vt9d/M0/RmiG3UXOX80x/bDIE7lpAfgdeIW5BcqMRv0/f4dwsi2jU403KqgxhHOv9/
	P7wKUkfeyHTWrPjAc8Fx9lOQdhgHU316Jn5QNOr4=
From: Sean Bruno <seanbru@yahoo-inc.com>
To: "freebsd-hackers@freebsd.org" <freebsd-hackers@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
Date: Mon, 09 Jul 2012 12:49:01 -0700
Message-ID: <1341863341.6064.11.camel@powernoodle.corp.yahoo.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port 
Content-Transfer-Encoding: 7bit
X-Milter-Version: master.31+4-gbc07cd5+
X-CLX-ID: 863342000
Cc: rmacklem@freebsd.org
Subject: dtraceall.ko with old nfsclient
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: sbruno@freebsd.org
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jul 2012 19:49:41 -0000

Ran into some symbol errors with the dtraceall module when using the
*old* nfs client.

I think that this is more or less the right thing to do, but I'm not
sure.

--- //depot/yahoo/ybsd_9/src/sys/modules/dtrace/dtraceall/dtraceall.c
2011-11-02 23:46:55.000000000 0000
+++ /home/seanbru/dtrace_9/src/sys/modules/dtrace/dtraceall/dtraceall.c
2011-11-02 23:46:55.000000000 0000
@@ -66,8 +66,11 @@
 MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1);
+#if defined (NFSCL)
 MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1);
+#else /* defined (NFSCLIENT) */
 MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1);
+#endif
 #if defined(__amd64__) || defined(__i386__)
 MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
 MODULE_DEPEND(dtraceall, fasttrap, 1, 1, 1);