Commit-ID: 89ab9cb16931873ec600a909b3a38436352e629a Gitweb: http://git.kernel.org/tip/89ab9cb16931873ec600a909b3a38436352e629a Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Wed, 13 Jul 2016 17:16:28 +0000 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Thu, 14 Jul 2016 09:34:42 +0200
perf/core: Remove perf CPU notifier code All users converted to state machine callbacks. Signed-off-by: Thomas Gleixner <t...@linutronix.de> Signed-off-by: Anna-Maria Gleixner <anna-ma...@linutronix.de> Reviewed-by: Sebastian Andrzej Siewior <bige...@linutronix.de> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: Arnaldo Carvalho de Melo <a...@kernel.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Nicolas Iooss <nicolas.iooss_li...@m4x.org> Cc: Paul E. McKenney <paul...@linux.vnet.ibm.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: r...@linutronix.de Link: http://lkml.kernel.org/r/20160713153335.115333...@linutronix.de Signed-off-by: Ingo Molnar <mi...@kernel.org> --- include/linux/cpu.h | 2 -- include/linux/perf_event.h | 35 ----------------------------------- 2 files changed, 37 deletions(-) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 21597dc..ca2dd86 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -59,8 +59,6 @@ struct notifier_block; * CPU notifier priorities. */ enum { - CPU_PRI_PERF = 20, - /* bring up workqueues before normal notifiers and down after */ CPU_PRI_WORKQUEUE_UP = 5, CPU_PRI_WORKQUEUE_DOWN = -5, diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 9abeb69..ddd3dab 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1285,41 +1285,6 @@ static inline void perf_restore_debug_store(void) { } #define perf_output_put(handle, x) perf_output_copy((handle), &(x), sizeof(x)) -/* - * This has to have a higher priority than migration_notifier in sched/core.c. - */ -#define perf_cpu_notifier(fn) \ -do { \ - static struct notifier_block fn##_nb = \ - { .notifier_call = fn, .priority = CPU_PRI_PERF }; \ - unsigned long cpu = smp_processor_id(); \ - unsigned long flags; \ - \ - cpu_notifier_register_begin(); \ - fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE, \ - (void *)(unsigned long)cpu); \ - local_irq_save(flags); \ - fn(&fn##_nb, (unsigned long)CPU_STARTING, \ - (void *)(unsigned long)cpu); \ - local_irq_restore(flags); \ - fn(&fn##_nb, (unsigned long)CPU_ONLINE, \ - (void *)(unsigned long)cpu); \ - __register_cpu_notifier(&fn##_nb); \ - cpu_notifier_register_done(); \ -} while (0) - -/* - * Bare-bones version of perf_cpu_notifier(), which doesn't invoke the - * callback for already online CPUs. - */ -#define __perf_cpu_notifier(fn) \ -do { \ - static struct notifier_block fn##_nb = \ - { .notifier_call = fn, .priority = CPU_PRI_PERF }; \ - \ - __register_cpu_notifier(&fn##_nb); \ -} while (0) - struct perf_pmu_events_attr { struct device_attribute attr; u64 id;
