From 7e12951e4dc9493aa62829b1d964da45ad8ccd63 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 29 Feb 2012 21:09:53 +0000 Subject: [PATCH] --- yaml --- r: 292484 b: refs/heads/master c: b1ada6010e234d6c53bfcd5a617610c9284846b8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/atomic.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9e682b2f74d4..62bd3e5ff22b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c15d7afbb2f9e2d3114b513306dae736b56f535 +refs/heads/master: b1ada6010e234d6c53bfcd5a617610c9284846b8 diff --git a/trunk/include/linux/atomic.h b/trunk/include/linux/atomic.h index 42b77b5446d2..70cfcb2d63c4 100644 --- a/trunk/include/linux/atomic.h +++ b/trunk/include/linux/atomic.h @@ -24,7 +24,9 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) * Atomically increments @v by 1, so long as @v is non-zero. * Returns non-zero if @v was non-zero, and zero otherwise. */ +#ifndef atomic_inc_not_zero #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#endif /** * atomic_inc_not_zero_hint - increment if not null