PERFORCE change 97784 for review

[John Birrell]

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

Change 97784 by jb at jb_freebsd2 on 2006/05/25 01:52:54

	The current CPU is referenced in a different way on FreeBSD. It's
	a pain to have to compatible-ise the 'CPU->' so just define these
	macros the way wee need them.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#16 edit

Differences ...

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

@@ -2254,6 +2254,7 @@
 extern void dtrace_getfsr(uint64_t *);
 #endif
 
+#if defined(sun)
 #define	DTRACE_CPUFLAG_ISSET(flag) \
 	(cpu_core[CPU->cpu_id].cpuc_dtrace_flags & (flag))
 
@@ -2262,6 +2263,16 @@
 
 #define	DTRACE_CPUFLAG_CLEAR(flag) \
 	(cpu_core[CPU->cpu_id].cpuc_dtrace_flags &= ~(flag))
+#else
+#define	DTRACE_CPUFLAG_ISSET(flag) \
+	(cpu_core[curcpu].cpuc_dtrace_flags & (flag))
+
+#define	DTRACE_CPUFLAG_SET(flag) \
+	(cpu_core[curcpu].cpuc_dtrace_flags |= (flag))
+
+#define	DTRACE_CPUFLAG_CLEAR(flag) \
+	(cpu_core[curcpu].cpuc_dtrace_flags &= ~(flag))
+#endif
 
 #if !defined(sun)
 void cmn_err(int, const char *, ...);