Small barrier() and cpu_relax() cleanup.
From: Heiko Carstens <[email protected]>
[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 <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
drivers/s390/char/sclp.c | 1 - include/asm-s390/processor.h | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/s390/char/sclp.c +0 -1
@@ -433,7 +433,6 @@ sclp_sync_wait(void)get_clock () > timeout && del_timer(&sclp_request_timer)) sclp_request_timer.function(sclp_request_timer.data); -barrier ();cpu_relax (); }local_irq_disable ();
include/asm-s390/processor.h +2 -3
@@ -201,9 +201,8 @@ unsigned long get_wchan(struct task_strustatic inline void cpu_relax (void ) {if (MACHINE_HAS_DIAG44 ) - asmvolatile ("diag 0,0,68" : : :"memory" ); -else -barrier (); + asmvolatile ("diag 0,0,68" ); +barrier (); }/*