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;