---

yaml --- r: 233475 b: refs/heads/master c: 03e3b5a h: refs/heads/master i: 233473: c4b7669 233471: 084caba v: v3
git-mirror · Feb 17, 2011 · a5af1b0 · a5af1b0
1 parent e6d4b1f
commit a5af1b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5da24b7627ff821e154a3aaecd5d60e1d8e228a5
+refs/heads/master: 03e3b5a0f18c53560de1984fbbfca146d31da2a5
diff --git a/trunk/arch/s390/include/asm/atomic.h b/trunk/arch/s390/include/asm/atomic.h
@@ -36,14 +36,12 @@
 
 static inline int atomic_read(const atomic_t *v)
 {
-	barrier();
-	return v->counter;
+	return ACCESS_ONCE(v->counter);
 }
 
 static inline void atomic_set(atomic_t *v, int i)
 {
 	v->counter = i;
-	barrier();
 }
 
 static inline int atomic_add_return(int i, atomic_t *v)
@@ -128,14 +126,12 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 
 static inline long long atomic64_read(const atomic64_t *v)
 {
-	barrier();
-	return v->counter;
+	return ACCESS_ONCE(v->counter);
 }
 
 static inline void atomic64_set(atomic64_t *v, long long i)
 {
 	v->counter = i;
-	barrier();
 }
 
 static inline long long atomic64_add_return(long long i, atomic64_t *v)