summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-07-10 11:24:16 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-07-10 11:24:49 +0200
commit048d5ce6828b9071e241254c7dba13d67bfef2c3 (patch)
tree76b052fbe2892ca1b0a73226471622a58d106ae5
parentdc4123303b54657389c952049bf5738dd753d004 (diff)
downloadlinux-3.10-048d5ce6828b9071e241254c7dba13d67bfef2c3.tar.gz
linux-3.10-048d5ce6828b9071e241254c7dba13d67bfef2c3.tar.bz2
linux-3.10-048d5ce6828b9071e241254c7dba13d67bfef2c3.zip
[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>
-rw-r--r--include/asm-s390/atomic.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/atomic.h b/include/asm-s390/atomic.h
index c17bdbf2206..ea486952f77 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) }