From owner-p4-projects@FreeBSD.ORG  Fri May 23 22:31:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 37A821065677; Fri, 23 May 2008 22:31:32 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED4831065675
	for <perforce@freebsd.org>; Fri, 23 May 2008 22:31:31 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C75F18FC13
	for <perforce@freebsd.org>; Fri, 23 May 2008 22:31:31 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4NMVVtg052561
	for <perforce@freebsd.org>; Fri, 23 May 2008 22:31:31 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4NMVVLu052559
	for perforce@freebsd.org; Fri, 23 May 2008 22:31:31 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 23 May 2008 22:31:31 GMT
Message-Id: <200805232231.m4NMVVLu052559@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 142167 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: Fri, 23 May 2008 22:31:32 -0000

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

Change 142167 by jb@freebsd3 on 2008/05/23 22:30:38

	IFC

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/dev/cyclic/cyclic.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/dev/cyclic/cyclic_test.c#1 branch
.. //depot/projects/dtrace/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#1 branch
.. //depot/projects/dtrace/src/sys/conf/NOTES#55 integrate
.. //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#14 integrate

Differences ...

==== //depot/projects/dtrace/src/sys/conf/NOTES#55 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1489 2008/05/22 18:19:49 maxim Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1490 2008/05/23 22:17:28 jb Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #

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

@@ -1,6 +1,6 @@
-# $FreeBSD: src/sys/modules/cyclic/Makefile,v 1.1 2008/05/17 02:31:17 jb Exp $
+# $FreeBSD: src/sys/modules/cyclic/Makefile,v 1.2 2008/05/23 22:23:28 jb Exp $
 
-.PATH: ${.CURDIR}/../../cddl/cyclic
+.PATH: ${.CURDIR}/../../cddl/dev/cyclic
 
 KMOD=		cyclic
 SRCS=		cyclic.c
@@ -10,7 +10,7 @@
 CFLAGS+=	-I${.CURDIR}/../../cddl/compat/opensolaris		\
 		-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common	\
 		-I${.CURDIR}/../..					\
-		-I${.CURDIR}/../../cddl/cyclic/${MACHINE_ARCH}
+		-I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_ARCH}
 
 CFLAGS+=	-DDEBUG=1