From 151f83c16e4120db140103e63b7705e8a159f218 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 6 Dec 2006 14:42:57 -0800 Subject: [PATCH] --- yaml --- r: 42621 b: refs/heads/master c: f9e9dcb38f5106fa8cdac04a9e967d5487f1cd20 h: refs/heads/master i: 42619: 9a790f95964c8200e3ada70502ac666e9c5f116a v: v3 --- [refs] | 2 +- trunk/include/asm-i386/atomic.h | 2 +- trunk/include/asm-x86_64/atomic.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3c13883fc909..c2d622fde83d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16afea0255cf6963eb924d4334cdb5acb9074581 +refs/heads/master: f9e9dcb38f5106fa8cdac04a9e967d5487f1cd20 diff --git a/trunk/include/asm-i386/atomic.h b/trunk/include/asm-i386/atomic.h index 51a166242522..a6c024e2506f 100644 --- a/trunk/include/asm-i386/atomic.h +++ b/trunk/include/asm-i386/atomic.h @@ -14,7 +14,7 @@ * on us. We need to use _exactly_ the address the user gave us, * not some alias that contains the same information. */ -typedef struct { volatile int counter; } atomic_t; +typedef struct { int counter; } atomic_t; #define ATOMIC_INIT(i) { (i) } diff --git a/trunk/include/asm-x86_64/atomic.h b/trunk/include/asm-x86_64/atomic.h index 007e88d6d43f..93849f7abc24 100644 --- a/trunk/include/asm-x86_64/atomic.h +++ b/trunk/include/asm-x86_64/atomic.h @@ -21,7 +21,7 @@ * on us. We need to use _exactly_ the address the user gave us, * not some alias that contains the same information. */ -typedef struct { volatile int counter; } atomic_t; +typedef struct { int counter; } atomic_t; #define ATOMIC_INIT(i) { (i) }