From owner-svn-src-stable-8@FreeBSD.ORG Fri Mar 11 18:28:20 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DED501065670; Fri, 11 Mar 2011 18:28:20 +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 CCE6B8FC1A; Fri, 11 Mar 2011 18:28:20 +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 p2BISKQL089258; Fri, 11 Mar 2011 18:28:20 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BISKRN089256; Fri, 11 Mar 2011 18:28:20 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201103111828.p2BISKRN089256@svn.freebsd.org> From: Andriy Gapon Date: Fri, 11 Mar 2011 18:28:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219517 - stable/8/sys/mips/rmi/dev/xlr X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2011 18:28:21 -0000 Author: avg Date: Fri Mar 11 18:28:20 2011 New Revision: 219517 URL: http://svn.freebsd.org/changeset/base/219517 Log: MFC r216375,r216408: fix atomic_set_xxx misuse in rge Modified: stable/8/sys/mips/rmi/dev/xlr/rge.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/mips/rmi/dev/xlr/rge.c ============================================================================== --- stable/8/sys/mips/rmi/dev/xlr/rge.c Fri Mar 11 18:21:16 2011 (r219516) +++ stable/8/sys/mips/rmi/dev/xlr/rge.c Fri Mar 11 18:28:20 2011 (r219517) @@ -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_set_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_set_int(&(priv->frin_to_be_sent[i]), 0); + priv->frin_to_be_sent[i] = 0; } return 0;