From cae307e1ad4b0ae915f80b3f5c83157cd53959c8 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 29 Mar 2008 03:08:18 +0000 Subject: [PATCH] --- yaml --- r: 87926 b: refs/heads/master c: 7c43f2b888f9ca1fcb7b07abc4cbff4ca1b8e03b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-frv/system.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c184969b64f8..53297fe70750 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91e916cffec7c0153c5cbaa447151862a7a9a047 +refs/heads/master: 7c43f2b888f9ca1fcb7b07abc4cbff4ca1b8e03b diff --git a/trunk/include/asm-frv/system.h b/trunk/include/asm-frv/system.h index b400cea81487..2c57f4734746 100644 --- a/trunk/include/asm-frv/system.h +++ b/trunk/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; \ } \