summaryrefslogtreecommitdiffstats
path: root/arch/cris/include/asm/atomic.h
diff options
context:
space:
mode:
authorArun Sharma <asharma@fb.com>2011-07-27 01:09:06 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-27 01:49:47 +0200
commit60063497a95e716c9a689af3be2687d261f115b4 (patch)
tree6ce0d68db76982c53df46aee5f29f944ebf2c320 /arch/cris/include/asm/atomic.h
parentasm-generic: add another generic ext2 atomic bitops (diff)
downloadlinux-60063497a95e716c9a689af3be2687d261f115b4.tar.xz
linux-60063497a95e716c9a689af3be2687d261f115b4.zip
atomic: use <linux/atomic.h>
This allows us to move duplicated code in <asm/atomic.h> (atomic_inc_not_zero() for now) to <linux/atomic.h> Signed-off-by: Arun Sharma <asharma@fb.com> Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: David Miller <davem@davemloft.net> Cc: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris/include/asm/atomic.h')
-rw-r--r--arch/cris/include/asm/atomic.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/include/asm/atomic.h b/arch/cris/include/asm/atomic.h
index 88dc9b9c4ba0..ce9f67e4d977 100644
--- a/arch/cris/include/asm/atomic.h
+++ b/arch/cris/include/asm/atomic.h
@@ -150,7 +150,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
cris_atomic_restore(v, flags);
return ret != u;
}
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
/* Atomic operations are already serializing */
#define smp_mb__before_atomic_dec() barrier()