From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 10 Jul 2007 09:24:16 +0000 (+0200)
Subject: [S390] Remove volatile from atomic_t
X-Git-Tag: v2.6.23-rc1~1155^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=048d5ce6828b9071e241254c7dba13d67bfef2c3;p=linux-2.6

[S390] Remove volatile from atomic_t

Follow i386/x86_64 and remove 'volatile' from atomic_t.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/include/asm-s390/atomic.h b/include/asm-s390/atomic.h
index c17bdbf220..ea486952f7 100644
--- a/include/asm-s390/atomic.h
+++ b/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) }