diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-06-11 13:35:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-09 20:38:52 +0200 |
| commit | 5e11637e2c929e34dcc0fbbfb48bdb638937701a (patch) | |
| tree | ed782662362ee0ea5ac888588664aeb97e6f1312 /kernel | |
| parent | 9cb627d5f38830ca19aa0dca52d1d3a633018bf7 (diff) | |
| download | linux-5e11637e2c929e34dcc0fbbfb48bdb638937701a.tar.gz linux-5e11637e2c929e34dcc0fbbfb48bdb638937701a.tar.bz2 linux-5e11637e2c929e34dcc0fbbfb48bdb638937701a.zip | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | 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 657555a5f30f..db5b56064687 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; |