diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-10-14 08:06:24 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-10-14 10:15:39 +0200 |
| commit | ee9bf2e547f224b68b3a4cc08ad7eb919c9eca3f (patch) | |
| tree | 785af9511c2622f143e632e2e1b748514430684f /kernel | |
| parent | 71ef4d7a1a378901bb4a60ea1cdc2542a4d47f42 (diff) | |
| parent | 61e6cfa80de5760bbe406f4e815b7739205754d2 (diff) | |
| download | kernel_goldelico_gta04-ee9bf2e547f224b68b3a4cc08ad7eb919c9eca3f.zip kernel_goldelico_gta04-ee9bf2e547f224b68b3a4cc08ad7eb919c9eca3f.tar.gz kernel_goldelico_gta04-ee9bf2e547f224b68b3a4cc08ad7eb919c9eca3f.tar.bz2 | |
Merge remote-tracking branch 'linus/master' for 3.12-rc5
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index cb4238e..d49a9d2 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7234,15 +7234,15 @@ void perf_pmu_migrate_context(struct pmu *pmu, int src_cpu, int dst_cpu) perf_remove_from_context(event); unaccount_event_cpu(event, src_cpu); put_ctx(src_ctx); - list_add(&event->event_entry, &events); + list_add(&event->migrate_entry, &events); } mutex_unlock(&src_ctx->mutex); synchronize_rcu(); mutex_lock(&dst_ctx->mutex); - list_for_each_entry_safe(event, tmp, &events, event_entry) { - list_del(&event->event_entry); + list_for_each_entry_safe(event, tmp, &events, migrate_entry) { + list_del(&event->migrate_entry); if (event->state >= PERF_EVENT_STATE_OFF) event->state = PERF_EVENT_STATE_INACTIVE; account_event_cpu(event, dst_cpu); |