From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754728Ab0GIIjw (ORCPT ); Fri, 9 Jul 2010 04:39:52 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:60768 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093Ab0GIIju (ORCPT ); Fri, 9 Jul 2010 04:39:50 -0400 Message-Id: <20100709083247.750591853@chello.nl> User-Agent: quilt/0.47-1 Date: Fri, 09 Jul 2010 10:21:20 +0200 From: Peter Zijlstra To: paulus , stephane eranian , Robert Richter , Will Deacon , Paul Mundt , Frederic Weisbecker , Cyrill Gorcunov , Lin Ming , Yanmin , Deng-Cheng Zhu , David Miller , Ingo Molnar Cc: linux-kernel@vger.kernel.org, Peter Zijlstra Subject: [PATCH 03/13] perf: Fix CPU hotplug References: <20100709082117.631541128@chello.nl> Content-Disposition: inline; filename=perf-x86-fix-cpuhotplug.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since we have UP_PREPARE, we should also have UP_CANCELED. Signed-off-by: Peter Zijlstra --- kernel/perf_event.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6/kernel/perf_event.c =================================================================== --- linux-2.6.orig/kernel/perf_event.c +++ linux-2.6/kernel/perf_event.c @@ -5743,15 +5743,15 @@ perf_cpu_notify(struct notifier_block *s { 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;