projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'tty-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[cascardo/linux.git]
/
arch
/
s390
/
include
/
asm
/
processor.h
diff --git
a/arch/s390/include/asm/processor.h
b/arch/s390/include/asm/processor.h
index
6f02d45
..
e568fc8
100644
(file)
--- a/
arch/s390/include/asm/processor.h
+++ b/
arch/s390/include/asm/processor.h
@@
-217,7
+217,7
@@
static inline void cpu_relax(void)
barrier();
}
-#define
arch_mutex_cpu_relax
() barrier()
+#define
cpu_relax_lowlatency
() barrier()
static inline void psw_set_key(unsigned int key)
{