Skip to content

Commit 3024048

Browse files
heicarstMartin Schwidefsky
authored and
Martin Schwidefsky
committed
---
yaml --- r: 173285 b: refs/heads/rpi-3.6.y c: bd119ee h: refs/heads/rpi-3.6.y i: 173283: 2f8f6c1 v: v3
1 parent 4415cc7 commit 3024048

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/rpi-3.6.y: 9d4bfd418503e90789bbc6685ddde994e613214d
2+
refs/heads/rpi-3.6.y: bd119ee29b447c521d66f6a5095fd3533d845da7

trunk/arch/s390/kernel/time.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ int get_sync_clock(unsigned long long *clock)
334334
sw0 = atomic_read(sw_ptr);
335335
*clock = get_clock();
336336
sw1 = atomic_read(sw_ptr);
337-
put_cpu_var(clock_sync_sync);
337+
put_cpu_var(clock_sync_word);
338338
if (sw0 == sw1 && (sw0 & 0x80000000U))
339339
/* Success: time is in sync. */
340340
return 0;
@@ -384,7 +384,7 @@ static inline int check_sync_clock(void)
384384

385385
sw_ptr = &get_cpu_var(clock_sync_word);
386386
rc = (atomic_read(sw_ptr) & 0x80000000U) != 0;
387-
put_cpu_var(clock_sync_sync);
387+
put_cpu_var(clock_sync_word);
388388
return rc;
389389
}
390390

0 commit comments

Comments
 (0)