From owner-svn-src-head@FreeBSD.ORG  Mon Dec 13 14:30:35 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BF0AD106566B;
	Mon, 13 Dec 2010 14:30:35 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AD7788FC0C;
	Mon, 13 Dec 2010 14:30:35 +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 oBDEUZXN084948;
	Mon, 13 Dec 2010 14:30:35 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBDEUZFZ084946;
	Mon, 13 Dec 2010 14:30:35 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201012131430.oBDEUZFZ084946@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 13 Dec 2010 14:30:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216408 - head/sys/mips/rmi/dev/xlr
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Dec 2010 14:30:35 -0000

Author: avg
Date: Mon Dec 13 14:30:35 2010
New Revision: 216408
URL: http://svn.freebsd.org/changeset/base/216408

Log:
  fix mips build breakage introduced in r216375: atomic_store_int doesn't exists
  
  1) 32-bit assignment are expected to always be atomic.
  2) Release/acquire memory barrier semantics doesn't seem to be needed here.
  So a simple assignment can be used.
  
  Remove unused port_set_counter() while here, it also used to mis-use
  atomic_set_int().
  
  Reported by:	jhb
  Pointyhat to:	avg
  MFC after:	3 weeks

Modified:
  head/sys/mips/rmi/dev/xlr/rge.c

Modified: head/sys/mips/rmi/dev/xlr/rge.c
==============================================================================
--- head/sys/mips/rmi/dev/xlr/rge.c	Mon Dec 13 13:52:03 2010	(r216407)
+++ head/sys/mips/rmi/dev/xlr/rge.c	Mon Dec 13 14:30:35 2010	(r216408)
@@ -170,10 +170,8 @@ extern uint32_t cpu_ltop_map[32];
 static int port_counters[4][8] __aligned(XLR_CACHELINE_SIZE);
 
 #define port_inc_counter(port, counter) 	atomic_add_int(&port_counters[port][(counter)], 1)
-#define port_set_counter(port, counter, value) 	atomic_store_int(&port_counters[port][(counter)], (value))
 #else
 #define port_inc_counter(port, counter)	/* Nothing */
-#define port_set_counter(port, counter, value)	/* Nothing */
 #endif
 
 int xlr_rge_tx_prepend[MAXCPU];
@@ -2281,7 +2279,7 @@ rmi_xlr_mac_open(struct rge_softc *sc)
 	mtx_unlock_spin(&priv->lock);
 
 	for (i = 0; i < 8; i++) {
-		atomic_store_int(&(priv->frin_to_be_sent[i]), 0);
+		priv->frin_to_be_sent[i] = 0;
 	}
 
 	return 0;