From 0c3864a5197a81be9ee87e021028847e102e5f24 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Thu, 18 Oct 2007 03:06:50 -0700
Subject: [PATCH] --- yaml --- r: 71208 b: refs/heads/master c:
 7c29ca5b8d13287ed67d2863f4c5f7bfc1a15279 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-alpha/bitops.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 33190386ab88..aba4d1b928e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26333576fd0d0b52f6e4025c5aded97e188bdd44
+refs/heads/master: 7c29ca5b8d13287ed67d2863f4c5f7bfc1a15279
diff --git a/trunk/include/asm-alpha/bitops.h b/trunk/include/asm-alpha/bitops.h
index ca667d121898..f1bbe6cf0e84 100644
--- a/trunk/include/asm-alpha/bitops.h
+++ b/trunk/include/asm-alpha/bitops.h
@@ -117,6 +117,9 @@ test_and_set_bit(unsigned long nr, volatile void *addr)
 	int *m = ((int *) addr) + (nr >> 5);
 
 	__asm__ __volatile__(
+#ifdef CONFIG_SMP
+	"	mb\n"
+#endif
 	"1:	ldl_l %0,%4\n"
 	"	and %0,%3,%2\n"
 	"	bne %2,2f\n"
@@ -158,6 +161,9 @@ test_and_clear_bit(unsigned long nr, volatile void * addr)
 	int *m = ((int *) addr) + (nr >> 5);
 
 	__asm__ __volatile__(
+#ifdef CONFIG_SMP
+	"	mb\n"
+#endif
 	"1:	ldl_l %0,%4\n"
 	"	and %0,%3,%2\n"
 	"	beq %2,2f\n"
@@ -199,6 +205,9 @@ test_and_change_bit(unsigned long nr, volatile void * addr)
 	int *m = ((int *) addr) + (nr >> 5);
 
 	__asm__ __volatile__(
+#ifdef CONFIG_SMP
+	"	mb\n"
+#endif
 	"1:	ldl_l %0,%4\n"
 	"	and %0,%3,%2\n"
 	"	xor %0,%3,%0\n"