projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
889c495
)
ARC: unbork !LLSC build
author
Vineet Gupta
<vgupta@synopsys.com>
Sun, 10 May 2015 06:34:01 +0000
(12:04 +0530)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sat, 6 Jun 2015 15:21:09 +0000
(08:21 -0700)
commit
daaf40e53b5dbdf75255d58a45ce8ac65ca511a8
upstream.
Fixes: f7d11e93ee97a locking,arch,arc: Fold atomic_ops
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arc/include/asm/atomic.h
patch
|
blob
|
history
diff --git
a/arch/arc/include/asm/atomic.h
b/arch/arc/include/asm/atomic.h
index 067551b6920af99fe733f1f13d4aee8b1903a77b..9917a45fc430d042a4f59006abf84ceedad1bca7 100644
(file)
--- a/
arch/arc/include/asm/atomic.h
+++ b/
arch/arc/include/asm/atomic.h
@@
-99,7
+99,7
@@
static inline void atomic_##op(int i, atomic_t *v) \
atomic_ops_unlock(flags); \
}
-#define ATOMIC_OP_RETURN(op, c_op
)
\
+#define ATOMIC_OP_RETURN(op, c_op
, asm_op)
\
static inline int atomic_##op##_return(int i, atomic_t *v) \
{ \
unsigned long flags; \