Messages in this thread Patch in this message | | | Date | Thu, 9 Sep 2010 19:45:29 GMT | From | tip-bot for Peter Zijlstra <> | Subject | [tip:perf/core] perf: Fix CPU hotplug |
| |
Commit-ID: 5e11637e2c929e34dcc0fbbfb48bdb638937701a Gitweb: http://git.kernel.org/tip/5e11637e2c929e34dcc0fbbfb48bdb638937701a Author: Peter Zijlstra <a.p.zijlstra@chello.nl> AuthorDate: Fri, 11 Jun 2010 13:35:08 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Thu, 9 Sep 2010 20:38:52 +0200
perf: Fix CPU hotplug
Since we have UP_PREPARE, we should also have UP_CANCELED.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: paulus <paulus@samba.org> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- kernel/perf_event.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 657555a..db5b560 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -5761,15 +5761,15 @@ perf_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) { unsigned int cpu = (long)hcpu; - switch (action) { + switch (action & ~CPU_TASKS_FROZEN) { case CPU_UP_PREPARE: - case CPU_UP_PREPARE_FROZEN: + case CPU_DOWN_FAILED: perf_event_init_cpu(cpu); break; + case CPU_UP_CANCELED: case CPU_DOWN_PREPARE: - case CPU_DOWN_PREPARE_FROZEN: perf_event_exit_cpu(cpu); break;
| |