From 55ecf7f50bb2b3f07b4c6c099f1473fcd835227b Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 5 Jun 2009 12:36:28 +1000 Subject: [PATCH] --- yaml --- r: 147663 b: refs/heads/master c: 6dc5f2a41759987e35e757ef00192e7b424563bb h: refs/heads/master i: 147661: 3dbf987703fc31f22e136e27341d94b9b20b8f8e 147659: eb3dfb6d7e86b3c3c4f12f9ba3bd24955210a352 147655: 240ebe70279fd28e39b6df14f6a061e8dde6e647 147647: 0b0be434b69ebdd6fce760b48b95a12eed1526ba v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8715b4d996c0..8c46cde28a08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76a0f40fd6eff1bce3b91925cea7587b3399fe80 +refs/heads/master: 6dc5f2a41759987e35e757ef00192e7b424563bb diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 195712e20d07..a5d3e2aedd2f 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -2234,7 +2234,7 @@ static int perf_output_begin(struct perf_output_handle *handle, perf_output_lock(handle); do { - offset = head = atomic_read(&data->head); + offset = head = atomic_long_read(&data->head); head += size; } while (atomic_long_cmpxchg(&data->head, offset, head) != offset);