patch-2.4.17 linux/arch/sparc64/lib/atomic.S

Next file: linux/arch/sparc64/lib/bitops.S
Previous file: linux/arch/sparc64/kernel/ttable.S
Back to the patch index
Back to the overall index

diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.16/arch/sparc64/lib/atomic.S linux/arch/sparc64/lib/atomic.S
@@ -1,4 +1,4 @@
-/* $Id: atomic.S,v 1.3 2000/03/16 16:44:37 davem Exp $
+/* $Id: atomic.S,v 1.4 2001/11/18 00:12:56 davem Exp $
  * atomic.S: These things are too big to do inline.
  *
  * Copyright (C) 1999 David S. Miller (davem@redhat.com)
@@ -19,7 +19,7 @@
 	cas	[%o1], %g5, %g7
 	cmp	%g5, %g7
 	bne,pn	%icc, __atomic_add
-	 nop
+	 membar	#StoreLoad | #StoreStore
 	retl
 	 add	%g7, %o0, %o0
 
@@ -30,7 +30,7 @@
 	cas	[%o1], %g5, %g7
 	cmp	%g5, %g7
 	bne,pn	%icc, __atomic_sub
-	 nop
+	 membar	#StoreLoad | #StoreStore
 	retl
 	 sub	%g7, %o0, %o0
 atomic_impl_end:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)