From: Heiko Carstens Date: Mon, 7 Dec 2009 11:52:14 +0000 (+0100) Subject: [S390] etr/stp: put correct per cpu variable X-Git-Tag: upstream/snapshot3+hdmi~16410^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd119ee29b447c521d66f6a5095fd3533d845da7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git [S390] etr/stp: put correct per cpu variable Fix this compile error in linux-next: arch/s390/kernel/time.c: In function 'get_sync_clock': arch/s390/kernel/time.c:337: error: 'clock_sync_sync' undeclared (first use in this function) Gets exposed because the new per cpu code references the variable passed to put_cpu_var. This was not a real bug. Reported-by: Sachin Sant Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 34162a0..75cdc0d 100644 --- a/arch/s390/kernel/time.c +++ b/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; }