NULL noise: frv cmpxchg()
authorAl Viro <viro@ftp.linux.org.uk>
Sat, 29 Mar 2008 03:08:18 +0000 (03:08 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Mar 2008 21:20:23 +0000 (14:20 -0700)
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>
include/asm-frv/system.h

index b400cea81487e8e84041fc89bd9a34b9978233b1..2c57f473474641d50942f615344c3daf5debea97 100644 (file)
@@ -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;                                                          \
        }                                                                       \