From owner-svn-src-user@FreeBSD.ORG  Thu May 13 20:51:21 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F5001065672;
	Thu, 13 May 2010 20:51:21 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1EB4C8FC22;
	Thu, 13 May 2010 20:51:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4DKpLxv045603;
	Thu, 13 May 2010 20:51:21 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4DKpK00045600;
	Thu, 13 May 2010 20:51:20 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <201005132051.o4DKpK00045600@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Thu, 13 May 2010 20:51:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208049 - in
	user/jmallett/octeon/sys/cddl/compat/opensolaris: kern sys
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 May 2010 20:51:21 -0000

Author: stas
Date: Thu May 13 20:51:20 2010
New Revision: 208049
URL: http://svn.freebsd.org/changeset/base/208049

Log:
  - Fix n32 mips build of opensolaris bits.
    Opensolaris code defines 63 bits atomics in non-LP64 case,
    which are also defined/supported by mips n32 code.

Modified:
  user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
  user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/atomic.h

Modified: user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
==============================================================================
--- user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c	Thu May 13 20:48:39 2010	(r208048)
+++ user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c	Thu May 13 20:51:20 2010	(r208049)
@@ -53,6 +53,7 @@ atomic_init(void)
 #endif
 
 #ifndef __LP64__
+#if !defined(__mips_n32)
 void
 atomic_add_64(volatile uint64_t *target, int64_t delta)
 {
@@ -61,6 +62,7 @@ atomic_add_64(volatile uint64_t *target,
 	*target += delta;
 	mtx_unlock(&atomic_mtx);
 }
+#endif
 
 void
 atomic_dec_64(volatile uint64_t *target)

Modified: user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/atomic.h
==============================================================================
--- user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/atomic.h	Thu May 13 20:48:39 2010	(r208048)
+++ user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/atomic.h	Thu May 13 20:51:20 2010	(r208049)
@@ -37,7 +37,9 @@
 #define cas32	atomic_cmpset_32
 
 #ifndef __LP64__
+#if !defined(__mips_n32)
 extern void atomic_add_64(volatile uint64_t *target, int64_t delta);
+#endif
 extern void atomic_dec_64(volatile uint64_t *target);
 extern void *atomic_cas_ptr(volatile void *target, void *cmp,  void *newval);
 #endif