diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-20 07:51:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-20 07:51:44 +0200 |
| commit | c258449bc9d286e2ee6546c9cdf911e96cbc126a (patch) | |
| tree | 51d389391bf6bef4be756652e401823f8171656e /kernel | |
| parent | 79b9ad361be8c6f3eeea97dd3883e8bcfa989333 (diff) | |
| parent | 2e600d01c131ee189f55ca1879cd364b9e056df8 (diff) | |
| download | op-kernel-dev-c258449bc9d286e2ee6546c9cdf911e96cbc126a.zip op-kernel-dev-c258449bc9d286e2ee6546c9cdf911e96cbc126a.tar.gz | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 12b5ec3..9ecaa45 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -1356,7 +1356,7 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx) u64 interrupts, freq; spin_lock(&ctx->lock); - list_for_each_entry(event, &ctx->group_list, group_entry) { + list_for_each_entry_rcu(event, &ctx->event_list, event_entry) { if (event->state != PERF_EVENT_STATE_ACTIVE) continue; |
