Merge branches 'acpi-battery', 'acpi-video' and 'acpi-misc'

[sfrench/cifs-2.6.git] / kernel / sched / clock.c

diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c
index d9272d9061a3b54ba9521273904388a543e5a91b..e374c0c923daec23b6ea5db5667465ce604b2ae0 100644 (file)
--- a/kernel/sched/clock.c
+++ b/kernel/sched/clock.c
@@ -287,7 +287,7 @@ again:
        clock = wrap_max(clock, min_clock);
        clock = wrap_min(clock, max_clock);
 
-       if (cmpxchg64(&scd->clock, old_clock, clock) != old_clock)
+       if (!try_cmpxchg64(&scd->clock, &old_clock, clock))
                goto again;
 
        return clock;
@@ -349,7 +349,7 @@ again:
                val = remote_clock;
        }
 
-       if (cmpxchg64(ptr, old_val, val) != old_val)
+       if (!try_cmpxchg64(ptr, &old_val, val))
                goto again;
 
        return val;