Index: src/sys/i386/include/atomic.h
===================================================================
RCS file: /home/ncvs/src/sys/i386/include/atomic.h,v
retrieving revision 1.25
diff -u -r1.25 atomic.h
--- src/sys/i386/include/atomic.h	11 Feb 2002 03:41:59 -0000	1.25
+++ src/sys/i386/include/atomic.h	28 Feb 2002 06:02:34 -0000
@@ -80,7 +80,7 @@
  * the binaries will run on both types of systems.
  */
 #if defined(SMP) || !defined(_KERNEL)
-#define MPLOCKED	"lock ; "
+#define MPLOCKED	lock ;
 #else
 #define MPLOCKED
 #endif
@@ -93,7 +93,7 @@
 static __inline void					\
 atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
 {							\
-	__asm __volatile(MPLOCKED OP			\
+	__asm __volatile(__XSTRING(MPLOCKED) OP		\
 			 : "+m" (*p)			\
 			 : CONS (V));			\
 }
@@ -137,7 +137,7 @@
 	int res = exp;
 
 	__asm __volatile (
-	"	" MPLOCKED "		"
+	"	" __XSTRING(MPLOCKED) "	"
 	"	cmpxchgl %1,%2 ;	"
 	"       setz	%%al ;		"
 	"	movzbl	%%al,%0 ;	"
@@ -180,7 +180,7 @@
 {							\
 	u_##TYPE res;					\
 							\
-	__asm __volatile(MPLOCKED LOP			\
+	__asm __volatile(__XSTRING(MPLOCKED) LOP	\
 	: "=a" (res),			/* 0 (result) */\
 	  "+m" (*p)			/* 1 */		\
 	: : "memory");				 	\
Index: src/sys/i386/include/mutex.h
===================================================================
RCS file: /home/ncvs/src/sys/i386/include/mutex.h,v
retrieving revision 1.34
diff -u -r1.34 mutex.h
--- src/sys/i386/include/mutex.h	18 Dec 2001 00:27:15 -0000	1.34
+++ src/sys/i386/include/mutex.h	28 Feb 2002 06:02:34 -0000
@@ -57,7 +57,7 @@
 	int	_res = MTX_UNOWNED;					\
 									\
 	__asm __volatile (						\
-"	" MPLOCKED ""							\
+"	" __XSTRING(MPLOCKED) ""					\
 "	cmpxchgl %3,%1;"			/* Try */		\
 "	jz	1f;"				/* Got it */		\
 "	andl	$" _V(MTX_FLAGMASK) ",%0;"	/* turn off spec bits */ \
@@ -69,7 +69,7 @@
 "	addl	$8,%%esp;"						\
 "	jmp	1f;"							\
 "2:"									\
-"	" MPLOCKED ""							\
+"	" __XSTRING(MPLOCKED) ""					\
 "	orl $" _V(MTX_RECURSE) ",%1;"					\
 "	incl	%2;"							\
 "1:"									\
@@ -90,7 +90,7 @@
 	__asm __volatile (						\
 "	pushfl;"							\
 "	cli;"								\
-"	" MPLOCKED ""							\
+"	" __XSTRING(MPLOCKED) ""					\
 "	cmpxchgl %3,%1;"			/* Try */		\
 "	jz	2f;"				/* got it */		\
 "	pushl	%4;"							\
@@ -118,7 +118,7 @@
 	int	_res = MTX_UNOWNED;					\
 									\
 	__asm __volatile (						\
-"	" MPLOCKED ""							\
+"	" __XSTRING(MPLOCKED) ""					\
 "	cmpxchgl %2,%1;"			/* Try */		\
 "	jz	1f;"				/* got it */		\
 "	pushl	%3;"							\
@@ -143,7 +143,7 @@
 	int	_tid = (int)(tid);					\
 									\
 	__asm __volatile (						\
-"	" MPLOCKED ""							\
+"	" __XSTRING(MPLOCKED) ""					\
 "	cmpxchgl %4,%0;"			/* try easy rel */	\
 "	jz	1f;"				/* released! */		\
 "	pushl	%2;"							\
@@ -168,7 +168,7 @@
 	int	_tid = (int)(tid);					\
 									\
 	__asm __volatile (						\
-"	" MPLOCKED ""							\
+"	" __XSTRING(MPLOCKED) ""					\
 "	cmpxchgl %5,%0;"			/* try easy rel */	\
 "	jz	1f;"				/* released! */		\
 "	testl	$" _V(MTX_RECURSE) ",%%eax;"	/* recursed? */		\