aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-06-11 13:35:08 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-09 20:38:52 +0200
commit5e11637e2c929e34dcc0fbbfb48bdb638937701a (patch)
treeed782662362ee0ea5ac888588664aeb97e6f1312 /kernel
parent9cb627d5f38830ca19aa0dca52d1d3a633018bf7 (diff)
downloadmrst-s0i3-test-5e11637e2c929e34dcc0fbbfb48bdb638937701a.tar.gz
mrst-s0i3-test-5e11637e2c929e34dcc0fbbfb48bdb638937701a.tar.xz
mrst-s0i3-test-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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 657555a5f30..db5b5606468 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;