---

yaml --- r: 173285 b: refs/heads/rpi-3.6.y c: bd119ee h: refs/heads/rpi-3.6.y i: 173283: 2f8f6c1 v: v3
raspberrypi · Dec 7, 2009 · 3024048 · 3024048
1 parent 4415cc7
commit 3024048
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/rpi-3.6.y: 9d4bfd418503e90789bbc6685ddde994e613214d
+refs/heads/rpi-3.6.y: bd119ee29b447c521d66f6a5095fd3533d845da7
diff --git 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;
 }