From bc8022ea4afbd5dcf50c84deaf2930ece62a30fe Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Mon, 13 Dec 2010 14:30:35 +0000 Subject: [PATCH] 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 --- sys/mips/rmi/dev/xlr/rge.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/mips/rmi/dev/xlr/rge.c b/sys/mips/rmi/dev/xlr/rge.c index e6bc6da6d5b..913084f5252 100644 --- a/sys/mips/rmi/dev/xlr/rge.c +++ b/sys/mips/rmi/dev/xlr/rge.c @@ -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;