git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
include
/
asm
/
mutex.h
diff --git
a/arch/sh/include/asm/mutex.h
b/arch/sh/include/asm/mutex.h
index 458c1f7fbc1808d48982aa0c5fe89bfe3df2098c..d8e37716a4a03bc4d132fee396666aa4b4b0ddc2 100644
(file)
--- a/
arch/sh/include/asm/mutex.h
+++ b/
arch/sh/include/asm/mutex.h
@@
-5,5
+5,8
@@
* implementation in place, or pick the atomic_xchg() based generic
* implementation. (see asm-generic/mutex-xchg.h for details)
*/
-
+#if defined(CONFIG_CPU_SH4A)
+#include <asm/mutex-llsc.h>
+#else
#include <asm-generic/mutex-dec.h>
+#endif