OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
51ef9c5
)
frv: missing casts in cmpxchg()
author
Al Viro
<viro@ftp.linux.org.uk>
Sun, 14 Oct 2007 18:35:10 +0000
(19:35 +0100)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Sun, 14 Oct 2007 19:41:51 +0000
(12:41 -0700)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/asm-frv/system.h
patch
|
blob
|
history
diff --git
a/include/asm-frv/system.h
b/include/asm-frv/system.h
index
6931af5
..
9f5663b
100644
(file)
--- a/
include/asm-frv/system.h
+++ b/
include/asm-frv/system.h
@@
-253,7
+253,10
@@
extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
__typeof__(*(ptr)) __xg_new = (new); \
\
switch (sizeof(__xg_orig)) { \
- case 4: __xg_orig = __cmpxchg_32(__xg_ptr, __xg_test, __xg_new); break; \
+ case 4: __xg_orig = (__force __typeof__(*ptr)) \
+ __cmpxchg_32((__force uint32_t *)__xg_ptr, \
+ (__force uint32_t)__xg_test, \
+ (__force uint32_t)__xg_new); break; \
default: \
__xg_orig = 0; \
asm volatile("break"); \