diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-03 10:07:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-03 10:07:35 +0200 |
| commit | 71966f3a0b24b408a87a0c475262638fbb71da99 (patch) | |
| tree | ce900472dd12f03fd6d0e764ea9f5a647471689d /arch/avr32/include/asm/cmpxchg.h | |
| parent | Merge branches 'x86/mm', 'x86/build', 'x86/apic' and 'x86/platform' into x86/... (diff) | |
| parent | lockdep: Do not break user-visible string (diff) | |
| download | linux-71966f3a0b24b408a87a0c475262638fbb71da99.tar.xz linux-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/avr32/include/asm/cmpxchg.h')
| -rw-r--r-- | arch/avr32/include/asm/cmpxchg.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/avr32/include/asm/cmpxchg.h b/arch/avr32/include/asm/cmpxchg.h index 962a6aeab787..366bbeaeb405 100644 --- a/arch/avr32/include/asm/cmpxchg.h +++ b/arch/avr32/include/asm/cmpxchg.h @@ -70,8 +70,6 @@ extern unsigned long __cmpxchg_u64_unsupported_on_32bit_kernels( if something tries to do an invalid cmpxchg(). */ extern void __cmpxchg_called_with_bad_pointer(void); -#define __HAVE_ARCH_CMPXCHG 1 - static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size) { |