aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-12-07 06:52:14 -0500
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2009-12-07 06:51:38 -0500
commitbd119ee29b447c521d66f6a5095fd3533d845da7 (patch)
tree7c5c78ea330d09cdc821fa7dfff466ef818b09c0 /arch/s390/kernel
parent9d4bfd418503e90789bbc6685ddde994e613214d (diff)
[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 <sachinp@in.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 34162a0b2caa..75cdc0d02415 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)
334 sw0 = atomic_read(sw_ptr); 334 sw0 = atomic_read(sw_ptr);
335 *clock = get_clock(); 335 *clock = get_clock();
336 sw1 = atomic_read(sw_ptr); 336 sw1 = atomic_read(sw_ptr);
337 put_cpu_var(clock_sync_sync); 337 put_cpu_var(clock_sync_word);
338 if (sw0 == sw1 && (sw0 & 0x80000000U)) 338 if (sw0 == sw1 && (sw0 & 0x80000000U))
339 /* Success: time is in sync. */ 339 /* Success: time is in sync. */
340 return 0; 340 return 0;
@@ -384,7 +384,7 @@ static inline int check_sync_clock(void)
384 384
385 sw_ptr = &get_cpu_var(clock_sync_word); 385 sw_ptr = &get_cpu_var(clock_sync_word);
386 rc = (atomic_read(sw_ptr) & 0x80000000U) != 0; 386 rc = (atomic_read(sw_ptr) & 0x80000000U) != 0;
387 put_cpu_var(clock_sync_sync); 387 put_cpu_var(clock_sync_word);
388 return rc; 388 return rc;
389} 389}
390 390