summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:12:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:12:00 -0700
commit37c2ca24119f7dd89cbbb43833df1e6c5fb3417b (patch)
tree7002e816ca784acbdd49c69752e08c4da00fe961 /kernel
parent6e958d73c25eecaf02a1998cda9ec8ce8da11042 (diff)
parent2e600d01c131ee189f55ca1879cd364b9e056df8 (diff)
downloadop-kernel-dev-37c2ca24119f7dd89cbbb43833df1e6c5fb3417b.zip
op-kernel-dev-37c2ca24119f7dd89cbbb43833df1e6c5fb3417b.tar.gz
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf timechart: Improve the visual appearance of scheduler delays perf timechart: Fix the wakeup-arrows that point to non-visible processes perf top: Fix --delay_secs 0 division by zero perf tools: Bump version to 0.0.2 perf_event: Adjust frequency and unthrottle for non-group-leader events
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 9d0b5c6..afb7ef3d 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -1355,7 +1355,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;
OpenPOWER on IntegriCloud