PERFORCE change 142010 for review
John Birrell
jb at FreeBSD.org
Thu May 22 01:44:36 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142010
Change 142010 by jb at freebsd3 on 2008/05/22 01:44:32
IFC (mk file loopback)
Affected files ...
.. //depot/projects/dtrace/src/share/mk/bsd.lib.mk#16 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.libnames.mk#12 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.prog.mk#10 integrate
.. //depot/projects/dtrace/src/share/mk/sys.mk#23 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.c#9 integrate
Differences ...
==== //depot/projects/dtrace/src/share/mk/bsd.lib.mk#16 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
-# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.184 2008/04/09 20:27:53 kan Exp $
+# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.185 2008/05/22 01:14:43 jb Exp $
#
.include <bsd.init.mk>
==== //depot/projects/dtrace/src/share/mk/bsd.libnames.mk#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.107 2008/05/07 13:53:12 dfr Exp $
+# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.108 2008/05/22 01:14:43 jb Exp $
# The include file <bsd.libnames.mk> define library names.
# Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
==== //depot/projects/dtrace/src/share/mk/bsd.prog.mk#10 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.150 2007/10/01 18:15:11 ru Exp $
+# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.151 2008/05/22 01:14:43 jb Exp $
.include <bsd.init.mk>
==== //depot/projects/dtrace/src/share/mk/sys.mk#23 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)sys.mk 8.2 (Berkeley) 3/21/94
-# $FreeBSD: src/share/mk/sys.mk,v 1.101 2008/04/04 21:12:40 imp Exp $
+# $FreeBSD: src/share/mk/sys.mk,v 1.102 2008/05/22 01:14:43 jb Exp $
unix ?= We run FreeBSD, not UNIX.
.FreeBSD ?= true
==== //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.c#9 (text) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.27 2007/10/20 23:23:18 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.28 2008/05/21 23:04:10 thompsa Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -459,7 +459,6 @@
done:
cv_broadcast(&scp->th_cv);
mtx_unlock(&scp->seq_lock);
- mtx_lock(&Giant);
SEQ_DEBUG(2, printf("seq_eventthread finished\n"));
kproc_exit(0);
}
More information about the p4-projects
mailing list