Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8b9d40691e8f5e7e0c8fb839c2bad29c5e0888ce

Authored by Mathieu Lacage
Committed by Arnd Bergmann
1 parent 6b0cd00bc3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

asm-generic: make atomic_add_unless a function 

atomic_add_unless is a macro so, bad things happen if the caller defines
a local variable named c, just like like the local variable c defined by
the macro. Thus, convert atomic_add_unless to a function. (bug triggered
by net/ipv4/netfilter/ipt_CLUSTERIP.c: clusterip_config_find_get calls
atomic_inc_not_zero)

Signed-off-by: Mathieu Lacage <mathieu.lacage@inria.fr>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Showing 1 changed file with 17 additions and 17 deletions Side-by-side Diff

include/asm-generic/atomic.h
Diff comments   View file @ 8b9d406
... ... @@ -119,15 +119,24 @@
119 119 #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0)
120 120 #define atomic_inc_and_test(v) (atomic_add_return(1, (v)) == 0)
121 121  
122   -#define atomic_add_unless(v, a, u) \
123   -({ \
124   - int c, old; \
125   - c = atomic_read(v); \
126   - while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
127   - c = old; \
128   - c != (u); \
129   -})
  122 +#define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v)))
  123 +#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new)))
130 124  
  125 +#define cmpxchg_local(ptr, o, n) \
  126 + ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
  127 + (unsigned long)(n), sizeof(*(ptr))))
  128 +
  129 +#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
  130 +
  131 +static inline int atomic_add_unless(atomic_t *v, int a, int u)
  132 +{
  133 + int c, old;
  134 + c = atomic_read(v);
  135 + while (c != u && (old = atomic_cmpxchg(v, c, c + a)) != c)
  136 + c = old;
  137 + return c != u;
  138 +}
  139 +
131 140 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
132 141  
133 142 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
... ... @@ -139,15 +148,6 @@
139 148 *addr &= mask;
140 149 raw_local_irq_restore(flags);
141 150 }
142   -
143   -#define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v)))
144   -#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new)))
145   -
146   -#define cmpxchg_local(ptr, o, n) \
147   - ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
148   - (unsigned long)(n), sizeof(*(ptr))))
149   -
150   -#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
151 151  
152 152 /* Assume that atomic operations are already serializing */
153 153 #define smp_mb__before_atomic_dec() barrier()