summaryrefslogtreecommitdiffstats
path: root/arch/m32r
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-03 10:07:35 +0200
committerIngo Molnar <mingo@kernel.org>2015-06-03 10:07:35 +0200
commit71966f3a0b24b408a87a0c475262638fbb71da99 (patch)
treece900472dd12f03fd6d0e764ea9f5a647471689d /arch/m32r
parent34e7724c0767f04f6199f2bd7232e9ab1207e1df (diff)
parent92ae18371cb1abb4e186dd9d48de2bb0d9bba626 (diff)
downloadlinux-stable-71966f3a0b24b408a87a0c475262638fbb71da99.tar.gz
linux-stable-71966f3a0b24b408a87a0c475262638fbb71da99.tar.bz2
linux-stable-71966f3a0b24b408a87a0c475262638fbb71da99.zip
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.h2
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)
((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr), \
sizeof(*(ptr))))
-#define __HAVE_ARCH_CMPXCHG 1
-
static inline unsigned long
__cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new)
{