aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-s390/processor.h
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-02-05 15:17:20 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-05 15:17:20 -0500
commitc48e09131bd7c632c80a3245688d2d29dbc4f6b5 (patch)
tree75ba8b96271121ae64724e967024bcc02b01e0ee /include/asm-s390/processor.h
parent1125b4640fea29aafe9bf24672e2da9672f6592e (diff)
[S390] Small barrier() and cpu_relax() cleanup.
cpu_relax() has barrier() semantics hence there is no need to use both of them in conjunction in sclp_sync_wait(). Also change cpu_relax() so it's more obvious that it has barrier semantics. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'include/asm-s390/processor.h')
-rw-r--r--include/asm-s390/processor.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h
index cbbedc63ba25..5dc6b938895f 100644
--- a/include/asm-s390/processor.h
+++ b/include/asm-s390/processor.h
@@ -201,9 +201,8 @@ unsigned long get_wchan(struct task_struct *p);
201static inline void cpu_relax(void) 201static inline void cpu_relax(void)
202{ 202{
203 if (MACHINE_HAS_DIAG44) 203 if (MACHINE_HAS_DIAG44)
204 asm volatile("diag 0,0,68" : : : "memory"); 204 asm volatile("diag 0,0,68");
205 else 205 barrier();
206 barrier();
207} 206}
208 207
209/* 208/*