Signed-off-by: Thomas Gleixner --- arch/blackfin/kernel/perf_event.c | 25 ++++--------------------- include/linux/cpuhotplug.h | 1 + 2 files changed, 5 insertions(+), 21 deletions(-) Index: linux-2.6/arch/blackfin/kernel/perf_event.c =================================================================== --- linux-2.6.orig/arch/blackfin/kernel/perf_event.c +++ linux-2.6/arch/blackfin/kernel/perf_event.c @@ -461,29 +461,13 @@ static struct pmu pmu = { .read = bfin_pmu_read, }; -static void bfin_pmu_setup(int cpu) +int __cpuinit bfin_pmu_prepare_cpu(unsigned int cpu) { struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu); + bfin_write_PFCTL(0); memset(cpuhw, 0, sizeof(struct cpu_hw_events)); -} - -static int __cpuinit -bfin_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu) -{ - unsigned int cpu = (long)hcpu; - - switch (action & ~CPU_TASKS_FROZEN) { - case CPU_UP_PREPARE: - bfin_write_PFCTL(0); - bfin_pmu_setup(cpu); - break; - - default: - break; - } - - return NOTIFY_OK; + return 0; } static int __init bfin_pmu_init(void) @@ -492,8 +476,7 @@ static int __init bfin_pmu_init(void) ret = perf_pmu_register(&pmu, "cpu", PERF_TYPE_RAW); if (!ret) - perf_cpu_notifier(bfin_pmu_notifier); - + cpuhp_setup_state(CPUHP_PERF_BFIN, bfin_pmu_prepare_cpu, NULL); return ret; } early_initcall(bfin_pmu_init); Index: linux-2.6/include/linux/cpuhotplug.h =================================================================== --- linux-2.6.orig/include/linux/cpuhotplug.h +++ linux-2.6/include/linux/cpuhotplug.h @@ -6,6 +6,7 @@ enum cpuhp_states { CPUHP_CREATE_THREADS, CPUHP_PERF_X86_UNCORE_PREP, CPUHP_PERF_X86_PREPARE, + CPUHP_PERF_BFIN, CPUHP_PERF_PREPARE, CPUHP_NOTIFY_PREPARE, CPUHP_NOTIFY_DEAD, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/