etr: Add barrier() to etr_sync_cpu_start().
From: Heiko Carstens <[email protected]>
[S390] etr: Add barrier() to etr_sync_cpu_start().
Force reading of *in_sync in while loop. Loops where the content that is checked for is changed by a different cpu always should have some sort of barrier() semantics.
Otherwise this might lead to very subtle bugs.
Signed-off-by Heiko Carstens <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
arch/s390/kernel/time.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletion(-)
arch/s390/kernel/time.c +9 -1
@@ -747,6 +747,7 @@ static void etr_adjust_time(unsigned lon } } +#ifdef CONFIG_SMP static void etr_sync_cpu_start (void *dummy) {int *in_sync = dummy;
@@ -758,8 +759,14 @@ static void etr_sync_cpu_start(void *dum* __udelay will stop the cpu on an enabled wait psw until the * TOD is running again. */ -while (*in_sync ==0 ) +while (*in_sync ==0 ) {__udelay (1 ); +/* +* A different cpu changes *in_sync. Therefore use +* barrier() to force memory access. +*/ +barrier (); + }if (*in_sync !=1 )/* Didn't work. Clear per-cpu in sync bit again. */ etr_disable_sync_clock (NULL );
@@ -773,6 +780,7 @@ static void etr_sync_cpu_start(void *dumstatic void etr_sync_cpu_end (void *dummy) { } +#endif /* CONFIG_SMP */ /* * Sync the TOD clock using the port refered to by aibp. This port
Signature · 8 lines
blue skies, IBM Deutschland Entwicklung GmbH
Martin Vorsitzender des Aufsichtsrats: Johann Weihen
Geschäftsführung: Herbert Kircher
Martin Schwidefsky Sitz der Gesellschaft: Böblingen
Linux on zSeries Registergericht: Amtsgericht Stuttgart,
Development HRB 243294
"Reality continues to ruin my life." - Calvin.