PERFORCE change 142167 for review

[John Birrell]

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

Change 142167 by jb at 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