--- ./linux-2.6-xen-sparse/include/asm-i386/spinlock.h	2006-08-02 15:29:34.000000000 +0200
+++ 2006-08-02/linux-2.6-xen-sparse/include/asm-i386/spinlock.h	2006-02-01 18:28:39.000000000 +0100
@@ -23,7 +23,7 @@
 		(*(volatile signed char *)(&(x)->slock) <= 0)
 
 #define __raw_spin_lock_string \
-	"\n1:\n" \
+	"\n1:\t" \
 	LOCK \
 	"decb %0\n\t" \
 	"jns 3f\n" \
@@ -35,7 +35,7 @@
 	"3:\n\t"
 
 #define __raw_spin_lock_string_flags \
-	"\n1:\n" \
+	"\n1:\t" \
 	LOCK \
 	"decb %0\n\t" \
 	"jns 4f\n\t" \
@@ -92,7 +92,7 @@ static inline int __raw_spin_trylock(raw
 		:"0" (0) : "memory");
 #else
 	__asm__ __volatile__(
-		"xchgb %b0,%1"
+		"xchgb %b0,%1\n"
 		:"=q" (oldval), "=m" (lock->slock)
 		:"0" (0) : "memory");
 #endif
--- ./linux-2.6-xen-sparse/include/asm-i386/system.h	2006-08-02 15:29:34.000000000 +0200
+++ 2006-08-02/linux-2.6-xen-sparse/include/asm-i386/system.h	2006-02-16 08:27:24.000000000 +0100
@@ -523,8 +523,8 @@ __asm__ __volatile__("6667:\nnop\nnop\nn
 		     :                                              \
 		     : "i" (X86_FEATURE_XMM2)                       \
 		     : "memory")
+#define smp_rmb() smp_alt_mb("lfence")
 #define smp_mb()  smp_alt_mb("mfence")
-#define smp_rmb() smp_alt_mb("lfence")
 #define set_mb(var, value) do {                                     \
 unsigned long __set_mb_temp;                                        \
 __asm__ __volatile__("6667:movl %1, %0\n6668:\n"                    \