diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-06-23 16:46:23 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-06-23 16:46:23 -0400 |
| commit | 8cf60e04a131310199d5776e2f9e915f0c468899 (patch) | |
| tree | 373a68e88e6737713a0a5723d552cdeefffff929 /include/asm-frv/atomic.h | |
| parent | 1323523f505606cfd24af6122369afddefc3b09d (diff) | |
| parent | 95eaa5fa8eb2c345244acd5f65b200b115ae8c65 (diff) | |
Auto-update from upstream
Diffstat (limited to 'include/asm-frv/atomic.h')
| -rw-r--r-- | include/asm-frv/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h index 9a4ff03c3969..066386ac238e 100644 --- a/include/asm-frv/atomic.h +++ b/include/asm-frv/atomic.h | |||
| @@ -227,7 +227,7 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig | |||
| 227 | break; \ | 227 | break; \ |
| 228 | \ | 228 | \ |
| 229 | default: \ | 229 | default: \ |
| 230 | __xg_orig = 0; \ | 230 | __xg_orig = (__typeof__(__xg_orig))0; \ |
| 231 | asm volatile("break"); \ | 231 | asm volatile("break"); \ |
| 232 | break; \ | 232 | break; \ |
| 233 | } \ | 233 | } \ |
| @@ -247,7 +247,7 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v); | |||
| 247 | switch (sizeof(__xg_orig)) { \ | 247 | switch (sizeof(__xg_orig)) { \ |
| 248 | case 4: __xg_orig = (__typeof__(*(ptr))) __xchg_32((uint32_t) x, __xg_ptr); break; \ | 248 | case 4: __xg_orig = (__typeof__(*(ptr))) __xchg_32((uint32_t) x, __xg_ptr); break; \ |
| 249 | default: \ | 249 | default: \ |
| 250 | __xg_orig = 0; \ | 250 | __xg_orig = (__typeof__(__xg_orig))0; \ |
| 251 | asm volatile("break"); \ | 251 | asm volatile("break"); \ |
| 252 | break; \ | 252 | break; \ |
| 253 | } \ | 253 | } \ |