From owner-p4-projects@FreeBSD.ORG  Sat May 27 05:27:46 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B59A16A868; Sat, 27 May 2006 05:27:46 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4ECCA16A831
	for <perforce@freebsd.org>; Sat, 27 May 2006 05:27:44 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0B96143D53
	for <perforce@freebsd.org>; Sat, 27 May 2006 05:27:44 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4R5Qf4b088883
	for <perforce@freebsd.org>; Sat, 27 May 2006 05:26:41 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4R5Qfur088880
	for perforce@freebsd.org; Sat, 27 May 2006 05:26:41 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 27 May 2006 05:26:41 GMT
Message-Id: <200605270526.k4R5Qfur088880@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 97922 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: Sat, 27 May 2006 05:27:49 -0000

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

Change 97922 by jb@jb_freebsd2 on 2006/05/27 05:26:34

	Sun won't accept code updates with #ifdefs, so I might as well start
	cleaning up files so that they look right in FreeBSD.
	
	This file is a prime candidate for being moved to sys/sys/dtrace.h and
	treated as FreeBSD-specific.
	
	There are code maintenance issues here which I don't have a solution to.
	It would be nice if there was a portable way to use OpenSolaris code. I
	just haven't figured out how to do that. SysV != BSD. Solaris != FreeBSD. 8-(

Affected files ...

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

Differences ...

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

@@ -2254,17 +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))
-
-#define	DTRACE_CPUFLAG_SET(flag) \
-	(cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= (flag))
-
-#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) \
@@ -2272,7 +2262,6 @@
 
 #define	DTRACE_CPUFLAG_CLEAR(flag) \
 	(cpu_core[curcpu].cpuc_dtrace_flags &= ~(flag))
-#endif
 
 #if !defined(sun)
 void cmn_err(int, const char *, ...);