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 ../linus
[pandora-kernel.git]
/
include
/
asm-h8300
/
atomic.h
diff --git
a/include/asm-h8300/atomic.h
b/include/asm-h8300/atomic.h
index
f23d868
..
21f5442
100644
(file)
--- a/
include/asm-h8300/atomic.h
+++ b/
include/asm-h8300/atomic.h
@@
-95,6
+95,8
@@
static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
return ret;
}
return ret;
}
+#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
+
static inline int atomic_add_unless(atomic_t *v, int a, int u)
{
int ret;
static inline int atomic_add_unless(atomic_t *v, int a, int u)
{
int ret;
@@
-137,4
+139,5
@@
static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v)
#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.h>
#endif /* __ARCH_H8300_ATOMIC __ */
#endif /* __ARCH_H8300_ATOMIC __ */