From owner-p4-projects@FreeBSD.ORG  Mon May  1 23:54:01 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 1A02716A404; Mon,  1 May 2006 23:54:01 +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 D311316A402
	for <perforce@freebsd.org>; Mon,  1 May 2006 23:54:00 +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 9F86543D45
	for <perforce@freebsd.org>; Mon,  1 May 2006 23:54:00 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k41Ns0Dx045962
	for <perforce@freebsd.org>; Mon, 1 May 2006 23:54:00 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41Ns0ZM045959
	for perforce@freebsd.org; Mon, 1 May 2006 23:54:00 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 1 May 2006 23:54:00 GMT
Message-Id: <200605012354.k41Ns0ZM045959@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 96529 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: Mon, 01 May 2006 23:54:01 -0000

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

Change 96529 by jb@jb_freebsd2 on 2006/05/01 23:53:14

	Ignore errors when loading and unloading modules.

Affected files ...

.. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#10 edit
.. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#10 (text+ko) ====

@@ -2,6 +2,17 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=	dtrace
+SUBDIR=	dtrace \
+	systrace
+
+load	:
+	-kldload dtrace
+	-kldload systrace
+	kldstat
+
+unload	:
+	-kldunload systrace
+	-kldunload dtrace
+	kldstat
 
 .include <bsd.subdir.mk>

==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#3 (text+ko) ====

@@ -24,13 +24,13 @@
 		dtrace_probe_lookup
 
 load	:
-	kldload dtrace
+	-kldload dtrace
 	kldstat
 
 unload	:
-	kldunload systrace
-	kldunload fasttrap
-	kldunload dtrace
+	-kldunload systrace
+	-kldunload fasttrap
+	-kldunload dtrace
 	kldstat
 
 .include <bsd.kmod.mk>