From owner-p4-projects@FreeBSD.ORG  Sun Dec 30 03:35:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4006416A420; Sun, 30 Dec 2007 03:35:23 +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 05E6916A41A
	for <perforce@freebsd.org>; Sun, 30 Dec 2007 03:35:23 +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 EA6C113C45D
	for <perforce@freebsd.org>; Sun, 30 Dec 2007 03:35:22 +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 lBU3ZMi2095227
	for <perforce@freebsd.org>; Sun, 30 Dec 2007 03:35:22 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU3ZMXw095220
	for perforce@freebsd.org; Sun, 30 Dec 2007 03:35:22 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 30 Dec 2007 03:35:22 GMT
Message-Id: <200712300335.lBU3ZMXw095220@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 132017 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: Sun, 30 Dec 2007 03:35:23 -0000

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

Change 132017 by jb@jb_freebsd1 on 2007/12/30 03:35:03

	Move the atomic stuff from zfs here.

Affected files ...

.. //depot/projects/dtrace/src/sys/modules/opensolaris/Makefile#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/modules/opensolaris/Makefile#2 (text+ko) ====

@@ -4,8 +4,15 @@
 
 KMOD=		opensolaris
 SRCS=		opensolaris.c		\
-		opensolaris_atomic.c	\
+		opensolaris_cmn_err.c	\
 		opensolaris_kmem.c
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
+.PATH:	${.CURDIR}/../../contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+SRCS+=		atomic.S
+.else
+SRCS+=		opensolaris_atomic.c
+.endif
 		
 CFLAGS+=	-I${.CURDIR}/../../compat/opensolaris			\
 		-I${.CURDIR}/../../contrib/opensolaris/uts/common	\