From ff2f30695183742b88ab843d9b4a29b225e35b27 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Wed, 30 Jan 2008 13:31:26 +0100 Subject: [PATCH] --- yaml --- r: 80023 b: refs/heads/master c: 01c57fb6a3eefc34da17be1399453c0800bcff68 h: refs/heads/master i: 80021: 363a58f0fd39cbeb0ada021c967d51d5a0eb803e 80019: 23cb5576ad67519e71349b50993aae9d3cbbe5a3 80015: 95aa07afa3f413f3adbbdb23cd9555efd70ae9d1 v: v3 --- [refs] | 2 +- trunk/include/asm-x86/local.h | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 3d2c6ab5a463..f9d7e2ee46b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5638f99394d478bcba6384ac7c51e763d1a3a448 +refs/heads/master: 01c57fb6a3eefc34da17be1399453c0800bcff68 diff --git a/trunk/include/asm-x86/local.h b/trunk/include/asm-x86/local.h index f5677e208601..f852c62b3319 100644 --- a/trunk/include/asm-x86/local.h +++ b/trunk/include/asm-x86/local.h @@ -7,15 +7,14 @@ #include #include -typedef struct -{ +typedef struct { atomic_long_t a; } local_t; #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) } #define local_read(l) atomic_long_read(&(l)->a) -#define local_set(l,i) atomic_long_set(&(l)->a, (i)) +#define local_set(l, i) atomic_long_set(&(l)->a, (i)) static inline void local_inc(local_t *l) { @@ -137,7 +136,7 @@ static inline long local_add_return(long i, local_t *l) long __i; #ifdef CONFIG_M386 unsigned long flags; - if(unlikely(boot_cpu_data.x86 <= 3)) + if (unlikely(boot_cpu_data.x86 <= 3)) goto no_xadd; #endif /* Modern 486+ processor */ @@ -160,11 +159,11 @@ static inline long local_add_return(long i, local_t *l) static inline long local_sub_return(long i, local_t *l) { - return local_add_return(-i,l); + return local_add_return(-i, l); } -#define local_inc_return(l) (local_add_return(1,l)) -#define local_dec_return(l) (local_sub_return(1,l)) +#define local_inc_return(l) (local_add_return(1, l)) +#define local_dec_return(l) (local_sub_return(1, l)) #define local_cmpxchg(l, o, n) \ (cmpxchg_local(&((l)->a.counter), (o), (n))) @@ -202,8 +201,8 @@ static inline long local_sub_return(long i, local_t *l) */ #define __local_inc(l) local_inc(l) #define __local_dec(l) local_dec(l) -#define __local_add(i,l) local_add((i),(l)) -#define __local_sub(i,l) local_sub((i),(l)) +#define __local_add(i, l) local_add((i), (l)) +#define __local_sub(i, l) local_sub((i), (l)) /* Use these for per-cpu local_t variables: on some archs they are * much more efficient than these naive implementations. Note they take