diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:29:03 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:29:03 -0500 |
| commit | 1e93f66831b31d36efe69099ffee33d94e5a3af9 (patch) | |
| tree | d58857eb426a60dbc29b7ca1a28e69ffaeb39fc3 /arch/unicore32/include/asm/cmpxchg.h | |
| parent | 2bf81c8af92dd53890557c5d87875842d573a3e9 (diff) | |
| parent | 60541d778e536455970281de25b2476e01c03aef (diff) | |
| download | linux-1e93f66831b31d36efe69099ffee33d94e5a3af9.tar.gz linux-1e93f66831b31d36efe69099ffee33d94e5a3af9.tar.bz2 linux-1e93f66831b31d36efe69099ffee33d94e5a3af9.zip | |
Merge branch 'arch-unicore32' into no-rebases
Diffstat (limited to 'arch/unicore32/include/asm/cmpxchg.h')
| -rw-r--r-- | arch/unicore32/include/asm/cmpxchg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/include/asm/cmpxchg.h b/arch/unicore32/include/asm/cmpxchg.h index df4d5acfd19f..8e797ad4fa24 100644 --- a/arch/unicore32/include/asm/cmpxchg.h +++ b/arch/unicore32/include/asm/cmpxchg.h @@ -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; |