From owner-svn-src-head@FreeBSD.ORG Mon Dec 13 13:26:19 2010 Return-Path: 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 A6C4B1065674; Mon, 13 Dec 2010 13:26:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 757CB8FC0C; Mon, 13 Dec 2010 13:26:19 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 204D346B1A; Mon, 13 Dec 2010 08:26:19 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 3623F8A009; Mon, 13 Dec 2010 08:26:18 -0500 (EST) From: John Baldwin To: Andriy Gapon Date: Mon, 13 Dec 2010 07:47:52 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20101102; KDE/4.4.5; amd64; ; ) References: <201012111021.oBBALcrV004450@svn.freebsd.org> In-Reply-To: <201012111021.oBBALcrV004450@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201012130747.52865.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Mon, 13 Dec 2010 08:26:18 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r216375 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2010 13:26:19 -0000 On Saturday, December 11, 2010 5:21:38 am Andriy Gapon wrote: > Author: avg > Date: Sat Dec 11 10:21:38 2010 > New Revision: 216375 > URL: http://svn.freebsd.org/changeset/base/216375 > > Log: > fix atomic_set_xxx misuse in rge > > It seems that atomic_set_xxx and atomic_store_xxx were confused. > > Reviewed by: jhb (general issue) > 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 Sat Dec 11 10:18:05 2010 (r216374) > +++ head/sys/mips/rmi/dev/xlr/rge.c Sat Dec 11 10:21:38 2010 (r216375) > @@ -170,7 +170,7 @@ 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_set_int(&port_counters[port][(counter)], (value)) > +#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 */ > @@ -2281,7 +2281,7 @@ rmi_xlr_mac_open(struct rge_softc *sc) > mtx_unlock_spin(&priv->lock); > > for (i = 0; i < 8; i++) { > - atomic_set_int(&(priv->frin_to_be_sent[i]), 0); > + atomic_store_int(&(priv->frin_to_be_sent[i]), 0); Err, there is no such op for this. If you don't need a memory barrier then a simple assignment to 0 should suffice. -- John Baldwin