diff options
| -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 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;  |