diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2008-03-28 23:08:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-30 17:20:23 -0400 |
| commit | 7c43f2b888f9ca1fcb7b07abc4cbff4ca1b8e03b (patch) | |
| tree | 8e80976149d383d18506e4fe9ca0a8a503e60edb | |
| parent | 91e916cffec7c0153c5cbaa447151862a7a9a047 (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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h index b400cea81487..2c57f4734746 100644 --- a/include/asm-frv/system.h +++ b/include/asm-frv/system.h | |||
| @@ -234,7 +234,7 @@ extern void free_initmem(void); | |||
| 234 | break; \ | 234 | break; \ |
| 235 | \ | 235 | \ |
| 236 | default: \ | 236 | default: \ |
| 237 | __xg_orig = 0; \ | 237 | __xg_orig = (__typeof__(__xg_orig))0; \ |
| 238 | asm volatile("break"); \ | 238 | asm volatile("break"); \ |
| 239 | break; \ | 239 | break; \ |
| 240 | } \ | 240 | } \ |
| @@ -259,7 +259,7 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new); | |||
| 259 | (__force uint32_t)__xg_test, \ | 259 | (__force uint32_t)__xg_test, \ |
| 260 | (__force uint32_t)__xg_new); break; \ | 260 | (__force uint32_t)__xg_new); break; \ |
| 261 | default: \ | 261 | default: \ |
| 262 | __xg_orig = 0; \ | 262 | __xg_orig = (__typeof__(__xg_orig))0; \ |
| 263 | asm volatile("break"); \ | 263 | asm volatile("break"); \ |
| 264 | break; \ | 264 | break; \ |
| 265 | } \ | 265 | } \ |