From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753998Ab3AaMLf (ORCPT ); Thu, 31 Jan 2013 07:11:35 -0500 Received: from www.linutronix.de ([62.245.132.108]:55896 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753262Ab3AaMLW (ORCPT ); Thu, 31 Jan 2013 07:11:22 -0500 Message-Id: <20130131120742.236009430@linutronix.de> User-Agent: quilt/0.48-1 Date: Thu, 31 Jan 2013 12:11:20 -0000 From: Thomas Gleixner To: LKML Cc: Ingo Molnar , Peter Zijlstra , Rusty Russell , Paul McKenney , "Srivatsa S. Bhat" , Arjan van de Veen , Paul Turner , Richard Weinberger , Magnus Damm Subject: [patch 11/40] x86: uncore: Move teardown callback to CPU_DEAD References: <20130131120348.372374706@linutronix.de> Content-Disposition: inline; filename=x86-uncore-refactor-hotplug-notifiers.patch X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No point calling this from the dying cpu. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6/arch/x86/kernel/cpu/perf_event_intel_uncore.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ linux-2.6/arch/x86/kernel/cpu/perf_event_intel_uncore.c @@ -2622,7 +2622,7 @@ static void __init uncore_pci_exit(void) } } -static void __cpuinit uncore_cpu_dying(int cpu) +static void __cpuinit uncore_cpu_dead(int cpu) { struct intel_uncore_type *type; struct intel_uncore_pmu *pmu; @@ -2803,8 +2803,8 @@ static int uncore_cpu_starting(cpu); break; case CPU_UP_CANCELED: - case CPU_DYING: - uncore_cpu_dying(cpu); + case CPU_DEAD: + uncore_cpu_dead(cpu); break; default: break;