]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer
authorGuan Xuetao <gxt@mprc.pku.edu.cn>
Thu, 14 Jun 2012 07:39:48 +0000 (15:39 +0800)
committerGuan Xuetao <gxt@mprc.pku.edu.cn>
Thu, 11 Oct 2012 05:58:58 +0000 (13:58 +0800)
When disintegrate system.h, I left an error in asm/cmpxchg.h, which
will result in following error:

arch/unicore32/include/asm/cmpxchg.h: In function '__xchg':
arch/unicore32/include/asm/cmpxchg.h:38: error: void value not ignored as it ought to be

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
arch/unicore32/include/asm/cmpxchg.h

index df4d5acfd19f96c9a10598a9230a0331fb7be798..8e797ad4fa24f52cbadb7b6a860a3b214d83eb3f 100644 (file)
@@ -35,7 +35,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
                        : "memory", "cc");
                break;
        default:
-               ret = __xchg_bad_pointer();
+               __xchg_bad_pointer();
        }
 
        return ret;