From e6486e14dca193782caca298280f5d60c088bd49 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 10 Jul 2007 11:24:16 +0200
Subject: [PATCH] --- yaml --- r: 58605 b: refs/heads/master c:
 048d5ce6828b9071e241254c7dba13d67bfef2c3 h: refs/heads/master i:   58603:
 0bd3f15db5e492bdd32df81dba33b9164c33f533 v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-s390/atomic.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 53e4ed560691..e43ea4df665c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc4123303b54657389c952049bf5738dd753d004
+refs/heads/master: 048d5ce6828b9071e241254c7dba13d67bfef2c3
diff --git a/trunk/include/asm-s390/atomic.h b/trunk/include/asm-s390/atomic.h
index c17bdbf22067..ea486952f778 100644
--- a/trunk/include/asm-s390/atomic.h
+++ b/trunk/include/asm-s390/atomic.h
@@ -24,7 +24,7 @@
  */
 
 typedef struct {
-	volatile int counter;
+	int counter;
 } __attribute__ ((aligned (4))) atomic_t;
 #define ATOMIC_INIT(i)  { (i) }
 
@@ -141,7 +141,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
 
 #ifdef __s390x__
 typedef struct {
-	volatile long long counter;
+	long long counter;
 } __attribute__ ((aligned (8))) atomic64_t;
 #define ATOMIC64_INIT(i)  { (i) }