summaryrefslogtreecommitdiff
path: root/arch/s390/include/asm/mutex.h
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-09-28 11:23:59 +0200
committerHeiko Carstens <heiko.carstens@de.ibm.com>2013-09-28 12:46:21 +0200
commit083986e8248d978b6c961d3da6beb0c921c68220 (patch)
tree1a760afa3f006b21d2464a226c2792dc59ab845d /arch/s390/include/asm/mutex.h
parent6cac446bd37d9381815fe4c2b0e7b1fd1085000c (diff)
mutex: replace CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX with simple ifdef
Linus suggested to replace #ifndef CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX #define arch_mutex_cpu_relax() cpu_relax() #endif with just a simple #ifndef arch_mutex_cpu_relax # define arch_mutex_cpu_relax() cpu_relax() #endif to get rid of CONFIG_HAVE_CPU_RELAX_SIMPLE. So architectures can simply define arch_mutex_cpu_relax if they want an architecture specific function instead of having to add a select statement in their Kconfig in addition. Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/mutex.h')
-rw-r--r--arch/s390/include/asm/mutex.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/include/asm/mutex.h b/arch/s390/include/asm/mutex.h
index 688271f5f2e4..458c1f7fbc18 100644
--- a/arch/s390/include/asm/mutex.h
+++ b/arch/s390/include/asm/mutex.h
@@ -7,5 +7,3 @@
*/
#include <asm-generic/mutex-dec.h>
-
-#define arch_mutex_cpu_relax() barrier()