diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 18:10:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 18:10:40 -0400 |
| commit | 84d88d5d4efc37dfb8a93a4a58d8a227ee86ffa4 (patch) | |
| tree | 8dc2761f3111a7dfee01f290f2659faaa24ec06e /kernel | |
| parent | e399835c349b7d8339775a004a86a492a444e230 (diff) | |
| parent | 152f9d0710a62708710161bce1b29fa8292c8c11 (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched_clock: Fix atomicity/continuity bug by using cmpxchg64()
x86: Provide an alternative() based cmpxchg64()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched_clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c index ac2e1dc708bd..479ce5682d7c 100644 --- a/kernel/sched_clock.c +++ b/kernel/sched_clock.c | |||
| @@ -127,7 +127,7 @@ again: | |||
| 127 | clock = wrap_max(clock, min_clock); | 127 | clock = wrap_max(clock, min_clock); |
| 128 | clock = wrap_min(clock, max_clock); | 128 | clock = wrap_min(clock, max_clock); |
| 129 | 129 | ||
| 130 | if (cmpxchg(&scd->clock, old_clock, clock) != old_clock) | 130 | if (cmpxchg64(&scd->clock, old_clock, clock) != old_clock) |
| 131 | goto again; | 131 | goto again; |
| 132 | 132 | ||
| 133 | return clock; | 133 | return clock; |
| @@ -163,7 +163,7 @@ again: | |||
| 163 | val = remote_clock; | 163 | val = remote_clock; |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | if (cmpxchg(ptr, old_val, val) != old_val) | 166 | if (cmpxchg64(ptr, old_val, val) != old_val) |
| 167 | goto again; | 167 | goto again; |
| 168 | 168 | ||
| 169 | return val; | 169 | return val; |