patch-2.4.0-test9 linux/include/asm-i386/atomic.h

• Lines: 129
• Date: Mon Oct 2 11:01:17 2000
• Orig file: v2.4.0-test8/linux/include/asm-i386/atomic.h
• Orig date: Fri Sep 8 12:52:41 2000

diff -u --recursive --new-file v2.4.0-test8/linux/include/asm-i386/atomic.h linux/include/asm-i386/atomic.h
@@ -19,102 +19,96 @@
  * on us. We need to use _exactly_ the address the user gave us,
  * not some alias that contains the same information.
  */
-#define __atomic_fool_gcc(x) (*(volatile struct { int a[100]; } *)x)
-
-#ifdef CONFIG_SMP
 typedef struct { volatile int counter; } atomic_t;
-#else
-typedef struct { int counter; } atomic_t;
-#endif
 
 #define ATOMIC_INIT(i)	{ (i) }
 
 #define atomic_read(v)		((v)->counter)
 #define atomic_set(v,i)		(((v)->counter) = (i))
 
-static __inline__ void atomic_add(int i, volatile atomic_t *v)
+static __inline__ void atomic_add(int i, atomic_t *v)
 {
 	__asm__ __volatile__(
 		LOCK "addl %1,%0"
-		:"=m" (__atomic_fool_gcc(v))
-		:"ir" (i), "m" (__atomic_fool_gcc(v)));
+		:"=m" (v->counter)
+		:"ir" (i), "m" (v->counter));
 }
 
-static __inline__ void atomic_sub(int i, volatile atomic_t *v)
+static __inline__ void atomic_sub(int i, atomic_t *v)
 {
 	__asm__ __volatile__(
 		LOCK "subl %1,%0"
-		:"=m" (__atomic_fool_gcc(v))
-		:"ir" (i), "m" (__atomic_fool_gcc(v)));
+		:"=m" (v->counter)
+		:"ir" (i), "m" (v->counter));
 }
 
-static __inline__ int atomic_sub_and_test(int i, volatile atomic_t *v)
+static __inline__ int atomic_sub_and_test(int i, atomic_t *v)
 {
 	unsigned char c;
 
 	__asm__ __volatile__(
 		LOCK "subl %2,%0; sete %1"
-		:"=m" (__atomic_fool_gcc(v)), "=qm" (c)
-		:"ir" (i), "m" (__atomic_fool_gcc(v)));
+		:"=m" (v->counter), "=qm" (c)
+		:"ir" (i), "m" (v->counter) : "memory");
 	return c;
 }
 
-static __inline__ void atomic_inc(volatile atomic_t *v)
+static __inline__ void atomic_inc(atomic_t *v)
 {
 	__asm__ __volatile__(
 		LOCK "incl %0"
-		:"=m" (__atomic_fool_gcc(v))
-		:"m" (__atomic_fool_gcc(v)));
+		:"=m" (v->counter)
+		:"m" (v->counter));
 }
 
-static __inline__ void atomic_dec(volatile atomic_t *v)
+static __inline__ void atomic_dec(atomic_t *v)
 {
 	__asm__ __volatile__(
 		LOCK "decl %0"
-		:"=m" (__atomic_fool_gcc(v))
-		:"m" (__atomic_fool_gcc(v)));
+		:"=m" (v->counter)
+		:"m" (v->counter));
 }
 
-static __inline__ int atomic_dec_and_test(volatile atomic_t *v)
+static __inline__ int atomic_dec_and_test(atomic_t *v)
 {
 	unsigned char c;
 
 	__asm__ __volatile__(
 		LOCK "decl %0; sete %1"
-		:"=m" (__atomic_fool_gcc(v)), "=qm" (c)
-		:"m" (__atomic_fool_gcc(v)));
+		:"=m" (v->counter), "=qm" (c)
+		:"m" (v->counter) : "memory");
 	return c != 0;
 }
 
-static __inline__ int atomic_inc_and_test(volatile atomic_t *v)
+static __inline__ int atomic_inc_and_test(atomic_t *v)
 {
 	unsigned char c;
 
 	__asm__ __volatile__(
 		LOCK "incl %0; sete %1"
-		:"=m" (__atomic_fool_gcc(v)), "=qm" (c)
-		:"m" (__atomic_fool_gcc(v)));
+		:"=m" (v->counter), "=qm" (c)
+		:"m" (v->counter) : "memory");
 	return c != 0;
 }
 
-extern __inline__ int atomic_add_negative(int i, volatile atomic_t *v)
+static __inline__ int atomic_add_negative(int i, atomic_t *v)
 {
 	unsigned char c;
 
 	__asm__ __volatile__(
 		LOCK "addl %2,%0; sets %1"
-		:"=m" (__atomic_fool_gcc(v)), "=qm" (c)
-		:"ir" (i), "m" (__atomic_fool_gcc(v)));
+		:"=m" (v->counter), "=qm" (c)
+		:"ir" (i), "m" (v->counter) : "memory");
 	return c;
 }
 
 /* These are x86-specific, used by some header files */
 #define atomic_clear_mask(mask, addr) \
 __asm__ __volatile__(LOCK "andl %0,%1" \
-: : "r" (~(mask)),"m" (__atomic_fool_gcc(addr)) : "memory")
+: : "r" (~(mask)),"m" (*addr) : "memory")
 
 #define atomic_set_mask(mask, addr) \
 __asm__ __volatile__(LOCK "orl %0,%1" \
-: : "r" (mask),"m" (__atomic_fool_gcc(addr)) : "memory")
+: : "r" (mask),"m" (*addr) : "memory")
 
 #endif