git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
arch
/
cris
/
include
/
asm
/
atomic.h
diff --git
a/arch/cris/include/asm/atomic.h
b/arch/cris/include/asm/atomic.h
index
88dc9b9
..
bbf0938
100644
(file)
--- a/
arch/cris/include/asm/atomic.h
+++ b/
arch/cris/include/asm/atomic.h
@@
-138,7
+138,7
@@
static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-static inline int atomic_add_unless(atomic_t *v, int a, int u)
+static inline int
__
atomic_add_unless(atomic_t *v, int a, int u)
{
int ret;
unsigned long flags;
{
int ret;
unsigned long flags;
@@
-148,9
+148,8
@@
static inline int atomic_add_unless(atomic_t *v, int a, int u)
if (ret != u)
v->counter += a;
cris_atomic_restore(v, flags);
if (ret != u)
v->counter += a;
cris_atomic_restore(v, flags);
- return ret
!= u
;
+ return ret;
}
}
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
/* Atomic operations are already serializing */
#define smp_mb__before_atomic_dec() barrier()
/* Atomic operations are already serializing */
#define smp_mb__before_atomic_dec() barrier()
@@
-158,5
+157,4
@@
static inline int atomic_add_unless(atomic_t *v, int a, int u)
#define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier()
#define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier()
-#include <asm-generic/atomic-long.h>
#endif
#endif