diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-03 04:07:35 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-03 04:07:35 -0400 |
| commit | 71966f3a0b24b408a87a0c475262638fbb71da99 (patch) | |
| tree | ce900472dd12f03fd6d0e764ea9f5a647471689d /arch/m32r | |
| parent | 34e7724c0767f04f6199f2bd7232e9ab1207e1df (diff) | |
| parent | 92ae18371cb1abb4e186dd9d48de2bb0d9bba626 (diff) | |
Merge branch 'locking/core' into x86/core, to prepare for dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/include/asm/cmpxchg.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m32r/include/asm/cmpxchg.h b/arch/m32r/include/asm/cmpxchg.h index de651db20b43..14bf9b739dd2 100644 --- a/arch/m32r/include/asm/cmpxchg.h +++ b/arch/m32r/include/asm/cmpxchg.h | |||
| @@ -107,8 +107,6 @@ __xchg_local(unsigned long x, volatile void *ptr, int size) | |||
| 107 | ((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr), \ | 107 | ((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr), \ |
| 108 | sizeof(*(ptr)))) | 108 | sizeof(*(ptr)))) |
| 109 | 109 | ||
| 110 | #define __HAVE_ARCH_CMPXCHG 1 | ||
| 111 | |||
| 112 | static inline unsigned long | 110 | static inline unsigned long |
| 113 | __cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new) | 111 | __cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new) |
| 114 | { | 112 | { |