diff options
Diffstat (limited to 'include/asm-frv/atomic.h')
| -rw-r--r-- | include/asm-frv/atomic.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h index 5d9f84bfdcad..066386ac238e 100644 --- a/include/asm-frv/atomic.h +++ b/include/asm-frv/atomic.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #ifndef _ASM_ATOMIC_H | 14 | #ifndef _ASM_ATOMIC_H |
| 15 | #define _ASM_ATOMIC_H | 15 | #define _ASM_ATOMIC_H |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <asm/spr-regs.h> | 18 | #include <asm/spr-regs.h> |
| 20 | 19 | ||
| @@ -228,7 +227,7 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig | |||
| 228 | break; \ | 227 | break; \ |
| 229 | \ | 228 | \ |
| 230 | default: \ | 229 | default: \ |
| 231 | __xg_orig = 0; \ | 230 | __xg_orig = (__typeof__(__xg_orig))0; \ |
| 232 | asm volatile("break"); \ | 231 | asm volatile("break"); \ |
| 233 | break; \ | 232 | break; \ |
| 234 | } \ | 233 | } \ |
| @@ -248,7 +247,7 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v); | |||
| 248 | switch (sizeof(__xg_orig)) { \ | 247 | switch (sizeof(__xg_orig)) { \ |
| 249 | 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; \ |
| 250 | default: \ | 249 | default: \ |
| 251 | __xg_orig = 0; \ | 250 | __xg_orig = (__typeof__(__xg_orig))0; \ |
| 252 | asm volatile("break"); \ | 251 | asm volatile("break"); \ |
| 253 | break; \ | 252 | break; \ |
| 254 | } \ | 253 | } \ |