Index: sys/sparc64/include/cpufunc.h
===================================================================
RCS file: /home/ncvs/src/sys/sparc64/include/cpufunc.h,v
retrieving revision 1.25
diff -r1.25 cpufunc.h
160c160
< #define	wr(name, val, xor) do {						\
---
> #define	wr(name, val, _xor) do {					\
162c162
< 	    : : "r" (val), "rI" (xor));					\
---
> 	    : : "r" (val), "rI" (_xor));				\
171c171
< #define	wrpr(name, val, xor) do {					\
---
> #define	wrpr(name, val, _xor) do {					\
173c173
< 	    : : "r" (val), "rI" (xor));					\
---
> 	    : : "r" (val), "rI" (_xor));				\
183,185c183,185
< #define	wrtickcmpr(val, xor)	wr(asr23, (val), (xor))
< #define	wrstick(val, xor)	wr(asr24, (val), (xor))
< #define	wrstickcmpr(val, xor)	wr(asr25, (val), (xor))
---
> #define	wrtickcmpr(val, _xor)	wr(asr23, (val), (_xor))
> #define	wrstick(val, _xor)	wr(asr24, (val), (_xor))
> #define	wrstickcmpr(val, _xor)	wr(asr25, (val), (_xor))
188c188
<  * Macro intended to be used instead of wr(asr23, val, xor) for writing to
---
>  * Macro intended to be used instead of wr(asr23, val, _xor) for writing to
196c196
< #define	wrtickcmpr_bbwar(val, xor) ({					\
---
> #define	wrtickcmpr_bbwar(val, _xor) ({					\
203c203
< 	: : "r" (val), "rI" (xor));					\
---
> 	: : "r" (val), "rI" (_xor));					\