summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-02-05 21:17:20 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-05 21:17:20 +0100
commitc48e09131bd7c632c80a3245688d2d29dbc4f6b5 (patch)
tree75ba8b96271121ae64724e967024bcc02b01e0ee
parent[S390] cio: Use device_{create,remove}_bin_file. (diff)
downloadlinux-c48e09131bd7c632c80a3245688d2d29dbc4f6b5.tar.xz
linux-c48e09131bd7c632c80a3245688d2d29dbc4f6b5.zip
[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>
-rw-r--r--drivers/s390/char/sclp.c1
-rw-r--r--include/asm-s390/processor.h5
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 027cdc18df31..c1dd19bb7bf8 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -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();
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);
static inline void cpu_relax(void)
{
if (MACHINE_HAS_DIAG44)
- asm volatile("diag 0,0,68" : : : "memory");
- else
- barrier();
+ asm volatile("diag 0,0,68");
+ barrier();
}
/*