projects
/
linux
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mips_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips
[linux]
/
arch
/
mips
/
include
/
asm
/
cmpxchg.h
diff --git
a/arch/mips/include/asm/cmpxchg.h
b/arch/mips/include/asm/cmpxchg.h
index
7e25c5c
..
89e9fb7
100644
(file)
--- a/
arch/mips/include/asm/cmpxchg.h
+++ b/
arch/mips/include/asm/cmpxchg.h
@@
-204,8
+204,10
@@
static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
#else
#include <asm-generic/cmpxchg-local.h>
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
+#ifndef CONFIG_SMP
#define cmpxchg64(ptr, o, n) cmpxchg64_local((ptr), (o), (n))
#endif
+#endif
#undef __scbeqz