PERFORCE change 131211 for review

[John Birrell]

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

Change 131211 by jb at jb_freebsd1 on 2007/12/19 03:28:56

	WIP

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#4 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic_impl.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#4 (text) ====

@@ -558,7 +558,10 @@
 #include <sys/atomic.h>
 #include <sys/kmem.h>
 #include <sys/cmn_err.h>
+
+#if defined(sun)
 #include <sys/ddi.h>
+#endif
 
 #ifdef CYCLIC_TRACE
 
@@ -598,7 +601,7 @@
 			break;
 
 		if (cyc_coverage[ndx].cyv_why != NULL ||
-		    casptr(&cyc_coverage[ndx].cyv_why, NULL, why) != NULL) {
+		    casptr(&cyc_coverage[ndx].cyv_why, NULL, why) != 0) {
 
 			if (++ndx == CY_NCOVERAGE)
 				ndx = 0;

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic_impl.h#2 (text) ====

@@ -425,7 +425,7 @@
 } cyc_backend_t;
 
 extern void cyclic_init(cyc_backend_t *be, hrtime_t resolution);
-extern void cyclic_mp_init();
+extern void cyclic_mp_init(void);
 
 #ifdef DEBUG
 #define	CYCLIC_TRACE
@@ -483,7 +483,7 @@
 #define	CY_NCOVERAGE	127
 
 typedef struct cyc_coverage {
-	char *cyv_why;
+	volatile void *cyv_why;
 	int cyv_passive_count;
 	int cyv_count[CY_LEVELS];
 	uint64_t cyv_arg0;