[patch 10/16] Remove volatile from atomic_t

Martin Schwidefsky
2007-07-10T09:29:45Z

[-- Attachment #1: 010-atomic.diff --]
[-- Type: text/plain, Size: 982 bytes --]

From: Heiko Carstens <heiko.carstens@de.ibm.com>

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>
---

include/asm-s390/atomic.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: quilt-2.6/include/asm-s390/atomic.h
===================================================================
--- quilt-2.6.orig/include/asm-s390/atomic.h
+++ quilt-2.6/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(

#ifdef __s390x__
typedef struct {
- volatile long long counter;
+ long long counter;
} __attribute__ ((aligned (8))) atomic64_t;
#define ATOMIC64_INIT(i) { (i) }