--- /sys/src/9/ip/gre.c
+++ /sys/src/9/ip/gre.c
@@ -440,7 +440,7 @@ restart:
 	/*
 	 * Make sure the packet does not go away.
 	 */
-	_xinc(&bp->ref);
+	ainc(&bp->ref);
 	assert(bp->ref == 2);
 
 	ipoput4(c->p->f, bp, 0, gre->ttl - 1, gre->tos, nil);
@@ -803,7 +803,7 @@ grectldlresume(Conv *c, int, char **)
 		/*
 		 * Make sure the packet does not go away.
 		 */
-		_xinc(&bp->ref);
+		ainc(&bp->ref);
 		assert(bp->ref == 2);
 
 		ipoput4(c->p->f, bp, 0, gre->ttl - 1, gre->tos, nil);
--- /sys/src/9/kw/arch.c
+++ /sys/src/9/kw/arch.c
@@ -182,30 +182,9 @@ userureg(Ureg* ureg)
  */
 
 long
-_xdec(long *p)
+ainc(long *p)
 {
-	int s, v;
-
-	s = splhi();
-	v = --*p;
-	splx(s);
-	return v;
-}
-
-void
-_xinc(long *p)
-{
-	int s;
-
-	s = splhi();
-	++*p;
-	splx(s);
-}
-
-int
-ainc(int *p)
-{
-	int s, v;
+	long s, v;
 
 	s = splhi();
 	v = ++*p;
@@ -213,10 +192,10 @@ ainc(int *p)
 	return v;
 }
 
-int
-adec(int *p)
+long
+adec(long *p)
 {
-	int s, v;
+	long s, v;
 
 	s = splhi();
 	v = --*p;
--- /sys/src/9/kw/ether1116.c
+++ /sys/src/9/kw/ether1116.c
@@ -485,7 +485,7 @@ static void
 rxfreeb(Block *b)
 {
 	/* freeb(b) will have previously decremented b->ref to 0; raise to 1 */
-	_xinc(&b->ref);
+	ainc(&b->ref);
 	b->wp = b->rp =
 		(uchar*)((uintptr)(b->lim - Rxblklen) & ~(Bufalign - 1));
 	assert(((uintptr)b->rp & (Bufalign - 1)) == 0);
--- /sys/src/9/mtx/l.s
+++ /sys/src/9/mtx/l.s
@@ -281,7 +281,7 @@ tas0:
 	ISYNC
 	RETURN
 
-TEXT	_xinc(SB),$0	/* void _xinc(long *); */
+TEXT	ainc(SB),$0	/* void ainc(long *); */
 	MOVW	R3, R4
 xincloop:
 	DCBF	(R4)	/* fix for 603x bug */
@@ -291,7 +291,7 @@ xincloop:
 	BNE		xincloop
 	RETURN
 
-TEXT	_xdec(SB),$0	/* long _xdec(long *); */
+TEXT	adec(SB),$0	/* long adec(long *); */
 	MOVW	R3, R4
 xdecloop:
 	DCBF	(R4)	/* fix for 603x bug */
--- /sys/src/9/omap/arch.c
+++ /sys/src/9/omap/arch.c
@@ -183,30 +183,9 @@ userureg(Ureg* ureg)
  */
 
 long
-_xdec(long *p)
+ainc(long *p)
 {
-	int s, v;
-
-	s = splhi();
-	v = --*p;
-	splx(s);
-	return v;
-}
-
-void
-_xinc(long *p)
-{
-	int s;
-
-	s = splhi();
-	++*p;
-	splx(s);
-}
-
-int
-ainc(int *p)
-{
-	int s, v;
+	long s, v;
 
 	s = splhi();
 	v = ++*p;
@@ -214,10 +193,10 @@ ainc(int *p)
 	return v;
 }
 
-int
-adec(int *p)
+long
+adec(long *p)
 {
-	int s, v;
+	long s, v;
 
 	s = splhi();
 	v = --*p;
--- /sys/src/9/pc/ether82543gc.c
+++ /sys/src/9/pc/ether82543gc.c
@@ -761,7 +761,7 @@ gc82543allocb(Ctlr* ctlr)
 	if((bp = *(ctlr->freehead)) != nil){
 		*(ctlr->freehead) = bp->next;
 		bp->next = nil;
-		_xinc(&bp->ref);	/* prevent bp from being freed */
+		ainc(&bp->ref);	/* prevent bp from being freed */
 	}
 	iunlock(&freelistlock);
 	return bp;
--- /sys/src/9/pc/ether82563.c
+++ /sys/src/9/pc/ether82563.c
@@ -861,7 +861,7 @@ i82563rballoc(void)
 	if((bp = i82563rbpool) != nil){
 		i82563rbpool = bp->next;
 		bp->next = nil;
-		_xinc(&bp->ref);	/* prevent bp from being freed */
+		ainc(&bp->ref);	/* prevent bp from being freed */
 	}
 	iunlock(&i82563rblock);
 
--- /sys/src/9/pc/ether82598.c
+++ /sys/src/9/pc/ether82598.c
@@ -466,7 +466,7 @@ rballoc(void)
 	if((bp = rbpool) != nil){
 		rbpool = bp->next;
 		bp->next = 0;
-		_xinc(&bp->ref);	/* prevent bp from being freed */
+		ainc(&bp->ref);	/* prevent bp from being freed */
 	}
 	iunlock(&rblock);
 	return bp;
--- /sys/src/9/pc/etherdp83820.c
+++ /sys/src/9/pc/etherdp83820.c
@@ -512,7 +512,7 @@ dp83820rballoc(Desc* desc)
 		}
 		dp83820rbpool = bp->next;
 		bp->next = nil;
-		_xinc(&bp->ref);	/* prevent bp from being freed */
+		ainc(&bp->ref);	/* prevent bp from being freed */
 		iunlock(&dp83820rblock);
 	
 		desc->bufptr = PCIWADDR(bp->rp);
--- /sys/src/9/pc/etherigbe.c
+++ /sys/src/9/pc/etherigbe.c
@@ -789,7 +789,7 @@ igberballoc(void)
 	if((bp = igberbpool) != nil){
 		igberbpool = bp->next;
 		bp->next = nil;
-		_xinc(&bp->ref);	/* prevent bp from being freed */
+		ainc(&bp->ref);	/* prevent bp from being freed */
 	}
 	iunlock(&igberblock);
 
--- /sys/src/9/pc/etherm10g.c
+++ /sys/src/9/pc/etherm10g.c
@@ -821,7 +821,7 @@ balloc(Rx* rx)
 	if((bp = rx->pool->head) != nil){
 		rx->pool->head = bp->next;
 		bp->next = nil;
-		_xinc(&bp->ref);	/* prevent bp from being freed */
+		ainc(&bp->ref);	/* prevent bp from being freed */
 		rx->pool->n--;
 	}
 	iunlock(rx->pool);
--- /sys/src/9/pc/ethervt6105m.c
+++ /sys/src/9/pc/ethervt6105m.c
@@ -594,7 +594,7 @@ vt6105Mrballoc(void)
 	if((bp = vt6105Mrbpool) != nil){
 		vt6105Mrbpool = bp->next;
 		bp->next = nil;
-		_xinc(&bp->ref);	/* prevent bp from being freed */
+		ainc(&bp->ref);	/* prevent bp from being freed */
 	}
 	iunlock(&vt6105Mrblock);
 
--- /sys/src/9/pc/l.s
+++ /sys/src/9/pc/l.s
@@ -893,22 +893,22 @@ TEXT tas(SB), $0
 	XCHGL	AX, (BX)			/* lock->key */
 	RET
 
-TEXT _xinc(SB), $0				/* void _xinc(long*); */
+TEXT ainc(SB), $0				/* void ainc(long*); */
 	MOVL	l+0(FP), AX
 	LOCK;	INCL 0(AX)
 	RET
 
-TEXT _xdec(SB), $0				/* long _xdec(long*); */
+TEXT adec(SB), $0				/* long adec(long*); */
 	MOVL	l+0(FP), BX
 	XORL	AX, AX
 	LOCK;	DECL 0(BX)
-	JLT	_xdeclt
-	JGT	_xdecgt
+	JLT	adeclt
+	JGT	adecgt
 	RET
-_xdecgt:
+adecgt:
 	INCL	AX
 	RET
-_xdeclt:
+adeclt:
 	DECL	AX
 	RET
 
--- /sys/src/9/pc/mtrr.c
+++ /sys/src/9/pc/mtrr.c
@@ -188,7 +188,7 @@ mtrrop(Mtrrop **op)
 	 * wait for all CPUs to sync here, so that the MTRR setup gets
 	 * done at roughly the same time on all processors.
 	 */
-	_xinc(&bar1);
+	ainc(&bar1);
 	while(bar1 < conf.nmach)
 		microdelay(10);
 
@@ -212,14 +212,14 @@ mtrrop(Mtrrop **op)
 	 * wait for all CPUs to sync up again, so that we don't continue
 	 * executing while the MTRRs are still being set up.
 	 */
-	_xinc(&bar2);
+	ainc(&bar2);
 	while(bar2 < conf.nmach)
 		microdelay(10);
 	*op = nil;
-	_xdec(&bar1);
+	adec(&bar1);
 	while(bar1 > 0)
 		microdelay(10);
-	_xdec(&bar2);
+	adec(&bar2);
 	wakeup(&oprend);
 	splx(s);
 }
--- /sys/src/9/pcboot/l.s
+++ /sys/src/9/pcboot/l.s
@@ -259,22 +259,22 @@ TEXT tas(SB), $0
 	XCHGL	AX, (BX)			/* lock->key */
 	RET
 
-TEXT _xinc(SB), $0				/* void _xinc(long*); */
+TEXT ainc(SB), $0				/* void ainc(long*); */
 	MOVL	l+0(FP), AX
 	LOCK;	INCL 0(AX)
 	RET
 
-TEXT _xdec(SB), $0				/* long _xdec(long*); */
+TEXT adec(SB), $0				/* long adec(long*); */
 	MOVL	l+0(FP), BX
 	XORL	AX, AX
 	LOCK;	DECL 0(BX)
-	JLT	_xdeclt
-	JGT	_xdecgt
+	JLT	adeclt
+	JGT	adecgt
 	RET
-_xdecgt:
+adecgt:
 	INCL	AX
 	RET
-_xdeclt:
+adeclt:
 	DECL	AX
 	RET
 
--- /sys/src/9/port/allocb.c
+++ /sys/src/9/port/allocb.c
@@ -52,7 +52,7 @@ mem2block(void *buf, ulong usable, int malloced)
 	b->flag = 0;
 	b->ref = 0;
 	b->magic = Bmagic;
-	_xinc(&b->ref);
+	ainc(&b->ref);
 
 	/* align start of data portion by rounding up */
 	b->base = (uchar*)ALIGNUP((ulong)b + sizeof(Block));
@@ -151,7 +151,7 @@ freeb(Block *b)
 		panic("freeb: bad magic %#lux in Block %#p; caller pc %#p",
 			b->magic, b, getcallerpc(&b));
 
-	if((ref = _xdec(&b->ref)) > 0)
+	if((ref = adec(&b->ref)) > 0)
 		return;
 	if(ref < 0){
 		dumpstack();
--- /sys/src/9/port/portfns.h
+++ /sys/src/9/port/portfns.h
@@ -401,8 +401,8 @@ uvlong		nhgetv(void*);
 uint		nhgetl(void*);
 ushort		nhgets(void*);
 ulong		µs(void);
-void		_xinc(long*);
-long		_xdec(long*);
+long		ainc(long*);
+long		adec(long*);
 long		lcycles(void);
 
 #pragma varargck argpos iprint	1
--- /sys/src/9/port/taslock.c
+++ /sys/src/9/port/taslock.c
@@ -23,7 +23,7 @@ struct
 static void
 inccnt(Ref *r)
 {
-	_xinc(&r->ref);
+	ainc(&r->ref);
 }
 
 static int
@@ -31,7 +31,7 @@ deccnt(Ref *r)
 {
 	int x;
 
-	x = _xdec(&r->ref);
+	x = adec(&r->ref);
 	if(x < 0)
 		panic("deccnt pc=%#p", getcallerpc(&r));
 	return x;
--- /sys/src/9/port/ucallocb.c
+++ /sys/src/9/port/ucallocb.c
@@ -34,7 +34,7 @@ _ucallocb(int size)
 	b->free = 0;
 	b->flag = 0;
 	b->ref = 0;
-	_xinc(&b->ref);
+	ainc(&b->ref);
 
 	/* align start of data portion by rounding up */
 	addr = (ulong)b;
@@ -119,7 +119,7 @@ ucfreeb(Block *b)
 	void *dead = (void*)Bdead;
 	long ref;
 
-	if(b == nil || (ref = _xdec(&b->ref)) > 0)
+	if(b == nil || (ref = adec(&b->ref)) > 0)
 		return;
 
 	if(ref < 0){
--- /sys/src/9/ppc/l.s
+++ /sys/src/9/ppc/l.s
@@ -361,7 +361,7 @@ tas0:
 	SYNC
 	RETURN
 
-TEXT _xinc(SB), $0			/* void _xinc(long *); */
+TEXT ainc(SB), $0			/* long ainc(long *); */
 	MOVW	R3, R4
 xincloop:
 	DCBF	(R4)			/* fix for 603x bug */
@@ -371,7 +371,7 @@ xincloop:
 	BNE	xincloop
 	RETURN
 
-TEXT _xdec(SB), $0			/* long _xdec(long *); */
+TEXT adec(SB), $0			/* long adec(long *); */
 	MOVW	R3, R4
 xdecloop:
 	DCBF	(R4)			/* fix for 603x bug */
--- /sys/src/9/rb/devether.c
+++ /sys/src/9/rb/devether.c
@@ -711,7 +711,7 @@ athrballoc(void)
 	if((bp = athrbpool) != nil){
 		athrbpool = bp->next;
 		bp->next = nil;
-		_xinc(&bp->ref);	/* prevent bp from being freed */
+		ainc(&bp->ref);	/* prevent bp from being freed */
 	}
 	iunlock(&athrblock);
 	return bp;
--- /sys/src/9/rb/l.s
+++ /sys/src/9/rb/l.s
@@ -836,7 +836,7 @@ tas1:
 	NOP
 	RETURN
 
-TEXT	_xinc(SB), $0
+TEXT	ainc(SB), $0
 	MOVW	R1, R2		/* address of counter */
 loop:
 	MOVW	$1, R3
@@ -850,7 +850,7 @@ loop:
 	NOP
 	RETURN
 
-TEXT	_xdec(SB), $0
+TEXT	adec(SB), $0
 	SYNC
 	MOVW	R1, R2		/* address of counter */
 loop1:
--- /sys/src/9/teg2/ether8169.c
+++ /sys/src/9/teg2/ether8169.c
@@ -462,7 +462,7 @@ rballoc(void)
 	if((bp = rbpool) != nil){
 		rbpool = bp->next;
 		bp->next = nil;
-		_xinc(&bp->ref);	/* prevent bp from being freed */
+		ainc(&bp->ref);	/* prevent bp from being freed */
 	}
 	iunlock(&rblock);
 	return bp;