Index: kern_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/kern_mbuf.c,v
retrieving revision 1.3
diff -u -r1.3 kern_mbuf.c
--- kern_mbuf.c	2 Aug 2004 00:18:35 -0000	1.3
+++ kern_mbuf.c	10 Sep 2004 22:21:00 -0000
@@ -213,7 +213,7 @@
 #endif
 	} else
 		m->m_data = m->m_dat;
-	mbstat.m_mbufs += 1;	/* XXX */
+	atomic_add_long(&mbstat.m_mbufs, 1);
 	return (0);
 }
 
@@ -228,7 +228,7 @@
 	m = (struct mbuf *)mem;
 	if ((m->m_flags & M_PKTHDR) != 0)
 		m_tag_delete_chain(m, NULL);
-	mbstat.m_mbufs -= 1;	/* XXX */
+	atomic_subtract_long(&mbstat.m_mbufs, 1);
 }
 
 /* XXX Only because of stats */
@@ -240,8 +240,8 @@
 	m = (struct mbuf *)mem;
 	if ((m->m_flags & M_PKTHDR) != 0)
 		m_tag_delete_chain(m, NULL);
-	mbstat.m_mbufs -= 1;	/* XXX */
-	mbstat.m_mclusts -= 1;	/* XXX */
+	atomic_subtract_long(&mbstat.m_mbufs, 1);
+	atomic_subtract_long(&mbstat.m_mclusts, 1);
 }
 
 /*
@@ -266,7 +266,7 @@
 	m->m_ext.ref_cnt = (u_int *)uma_find_refcnt(zone_clust,
 	    m->m_ext.ext_buf);
 	*(m->m_ext.ref_cnt) = 1;
-	mbstat.m_mclusts += 1;	/* XXX */
+	atomic_add_long(&mbstat.m_mclusts, 1);
 	return (0);
 }
 
@@ -274,7 +274,7 @@
 static void
 mb_dtor_clust(void *mem, int size, void *arg)
 {
-	mbstat.m_mclusts -= 1;	/* XXX */
+	atomic_subtract_long(&mbstat.m_mclusts, 1);
 }
 
 /*
@@ -291,7 +291,7 @@
 	uma_zalloc_arg(zone_clust, m, how);
 	if (m->m_ext.ext_buf == NULL)
 		return (ENOMEM);
-	mbstat.m_mclusts -= 1;	/* XXX */
+	atomic_subtract_long(&mbstat.m_mclusts, 1);
 	return (0);
 }
 
@@ -307,7 +307,7 @@
 	m = (struct mbuf *)mem;
 	uma_zfree_arg(zone_clust, m->m_ext.ext_buf, NULL);
 	m->m_ext.ext_buf = NULL;
-	mbstat.m_mclusts += 1;	/* XXX */
+	atomic_add_long(&mbstat.m_mclusts, 1);
 }
 
 /*
@@ -351,8 +351,8 @@
 			return (error);
 #endif
 	}
-	mbstat.m_mbufs += 1;	/* XXX */
-	mbstat.m_mclusts += 1;	/* XXX */
+	atomic_add_long(&mbstat.m_mbufs, 1);
+	atomic_add_long(&mbstat.m_mclusts, 1);
 	return (0);
 }
 
@@ -372,7 +372,7 @@
 	WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK | WARN_PANIC, NULL,
 	    "mb_reclaim()");
 
-	mbstat.m_drain++;
+	atomic_add_long(&mbstat.m_drain, 1);
 	for (dp = domains; dp != NULL; dp = dp->dom_next)
 		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
 			if (pr->pr_drain != NULL)
Index: uipc_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_mbuf.c,v
retrieving revision 1.135
diff -u -r1.135 uipc_mbuf.c
--- uipc_mbuf.c	21 Jul 2004 21:03:01 -0000	1.135
+++ uipc_mbuf.c	10 Sep 2004 22:19:21 -0000
@@ -415,12 +415,12 @@
 		np = &n->m_next;
 	}
 	if (top == NULL)
-		mbstat.m_mcfail++;	/* XXX: No consistency. */
+		atomic_add_long(&mbstat.m_mcfail, 1);
 
 	return (top);
 nospace:
 	m_freem(top);
-	mbstat.m_mcfail++;	/* XXX: No consistency. */
+	atomic_add_long(&mbstat.m_mcfail, 1);
 	return (NULL);
 }
 
@@ -481,7 +481,7 @@
 	return top;
 nospace:
 	m_freem(top);
-	mbstat.m_mcfail++;	/* XXX: No consistency. */ 
+	atomic_add_long(&mbstat.m_mcfail, 1);
 	return (NULL);
 }
 
@@ -584,7 +584,7 @@
 
 nospace:
 	m_freem(top);
-	mbstat.m_mcfail++;	/* XXX: No consistency. */
+	atomic_add_long(&mbstat.m_mcfail, 1);
 	return (NULL);
 }
 
@@ -744,7 +744,7 @@
 	return (m);
 bad:
 	m_freem(n);
-	mbstat.m_mpfail++;	/* XXX: No consistency. */
+	atomic_add_long(&mbstat.m_mpfail, 1);
 	return (NULL);
 }