From d45083b366742dbe03799e21b04e8a49a149f41b Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 7 Dec 2009 12:52:14 +0100 Subject: [PATCH] --- yaml --- r: 173285 b: refs/heads/master c: bd119ee29b447c521d66f6a5095fd3533d845da7 h: refs/heads/master i: 173283: 74c08a23d04077a0efe408b39f11b646e83cda44 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/time.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6d409efdbd16..1fe12756b875 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d4bfd418503e90789bbc6685ddde994e613214d +refs/heads/master: bd119ee29b447c521d66f6a5095fd3533d845da7 diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index 34162a0b2caa..75cdc0d02415 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/arch/s390/kernel/time.c @@ -334,7 +334,7 @@ int get_sync_clock(unsigned long long *clock) sw0 = atomic_read(sw_ptr); *clock = get_clock(); sw1 = atomic_read(sw_ptr); - put_cpu_var(clock_sync_sync); + put_cpu_var(clock_sync_word); if (sw0 == sw1 && (sw0 & 0x80000000U)) /* Success: time is in sync. */ return 0; @@ -384,7 +384,7 @@ static inline int check_sync_clock(void) sw_ptr = &get_cpu_var(clock_sync_word); rc = (atomic_read(sw_ptr) & 0x80000000U) != 0; - put_cpu_var(clock_sync_sync); + put_cpu_var(clock_sync_word); return rc; }