aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-03-29 03:08:18 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-30 14:20:23 -0700
commit7c43f2b888f9ca1fcb7b07abc4cbff4ca1b8e03b (patch)
tree8e80976149d383d18506e4fe9ca0a8a503e60edb
parent91e916cffec7c0153c5cbaa447151862a7a9a047 (diff)
NULL noise: frv cmpxchg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-frv/system.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index b400cea8148..2c57f473474 100644
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
@@ -234,7 +234,7 @@ extern void free_initmem(void);
break; \
\
default: \
- __xg_orig = 0; \
+ __xg_orig = (__typeof__(__xg_orig))0; \
asm volatile("break"); \
break; \
} \
@@ -259,7 +259,7 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
(__force uint32_t)__xg_test, \
(__force uint32_t)__xg_new); break; \
default: \
- __xg_orig = 0; \
+ __xg_orig = (__typeof__(__xg_orig))0; \
asm volatile("break"); \
break; \
} \