From owner-svn-src-all@FreeBSD.ORG Sat Dec 11 10:21:38 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B758106564A; Sat, 11 Dec 2010 10:21:38 +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 8AC498FC1B; Sat, 11 Dec 2010 10:21:38 +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 oBBALc60004452; Sat, 11 Dec 2010 10:21:38 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBBALcrV004450; Sat, 11 Dec 2010 10:21:38 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201012111021.oBBALcrV004450@svn.freebsd.org> From: Andriy Gapon Date: Sat, 11 Dec 2010 10:21:38 +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: r216375 - head/sys/mips/rmi/dev/xlr X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Dec 2010 10:21:38 -0000 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); } return 0;