diff --git a/[refs] b/[refs]
index fba90de78b4f..9418fd67f152 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79e1dd05d1a22e95ab6d54d21836f478b3b56976
+refs/heads/master: 152f9d0710a62708710161bce1b29fa8292c8c11
diff --git a/trunk/kernel/sched_clock.c b/trunk/kernel/sched_clock.c
index ac2e1dc708bd..479ce5682d7c 100644
--- a/trunk/kernel/sched_clock.c
+++ b/trunk/kernel/sched_clock.c
@@ -127,7 +127,7 @@ static u64 sched_clock_local(struct sched_clock_data *scd)
 	clock = wrap_max(clock, min_clock);
 	clock = wrap_min(clock, max_clock);
 
-	if (cmpxchg(&scd->clock, old_clock, clock) != old_clock)
+	if (cmpxchg64(&scd->clock, old_clock, clock) != old_clock)
 		goto again;
 
 	return clock;
@@ -163,7 +163,7 @@ static u64 sched_clock_remote(struct sched_clock_data *scd)
 		val = remote_clock;
 	}
 
-	if (cmpxchg(ptr, old_val, val) != old_val)
+	if (cmpxchg64(ptr, old_val, val) != old_val)
 		goto again;
 
 	return val;