projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-7897 into release branch
[powerpc.git]
/
include
/
asm-arm26
/
atomic.h
diff --git
a/include/asm-arm26/atomic.h
b/include/asm-arm26/atomic.h
index
a47cadc
..
97e944f
100644
(file)
--- a/
include/asm-arm26/atomic.h
+++ b/
include/asm-arm26/atomic.h
@@
-20,7
+20,6
@@
#ifndef __ASM_ARM_ATOMIC_H
#define __ASM_ARM_ATOMIC_H
#ifndef __ASM_ARM_ATOMIC_H
#define __ASM_ARM_ATOMIC_H
-#include <linux/config.h>
#ifdef CONFIG_SMP
#error SMP is NOT supported
#ifdef CONFIG_SMP
#error SMP is NOT supported
@@
-76,6
+75,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;
@@
-118,5
+119,6
@@
static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
#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
#endif
#endif
#endif