aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-07-13 13:16:28 -0400
committerIngo Molnar <mingo@kernel.org>2016-07-14 03:34:42 -0400
commit89ab9cb16931873ec600a909b3a38436352e629a (patch)
tree20ac765ab3390536bd97f24bf47468e9abad97b5
parent8381f6a0c02fdf457d1712cb82f2f0240f2f03cc (diff)
perf/core: Remove perf CPU notifier code
All users converted to state machine callbacks. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de> Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160713153335.115333381@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--include/linux/cpu.h2
-rw-r--r--include/linux/perf_event.h35
2 files changed, 0 insertions, 37 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 21597dcac0e2..ca2dd865a34e 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -59,8 +59,6 @@ struct notifier_block;
59 * CPU notifier priorities. 59 * CPU notifier priorities.
60 */ 60 */
61enum { 61enum {
62 CPU_PRI_PERF = 20,
63
64 /* bring up workqueues before normal notifiers and down after */ 62 /* bring up workqueues before normal notifiers and down after */
65 CPU_PRI_WORKQUEUE_UP = 5, 63 CPU_PRI_WORKQUEUE_UP = 5,
66 CPU_PRI_WORKQUEUE_DOWN = -5, 64 CPU_PRI_WORKQUEUE_DOWN = -5,
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 9abeb6948e70..ddd3dab0f39e 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) { }
1285 1285
1286#define perf_output_put(handle, x) perf_output_copy((handle), &(x), sizeof(x)) 1286#define perf_output_put(handle, x) perf_output_copy((handle), &(x), sizeof(x))
1287 1287
1288/*
1289 * This has to have a higher priority than migration_notifier in sched/core.c.
1290 */
1291#define perf_cpu_notifier(fn) \
1292do { \
1293 static struct notifier_block fn##_nb = \
1294 { .notifier_call = fn, .priority = CPU_PRI_PERF }; \
1295 unsigned long cpu = smp_processor_id(); \
1296 unsigned long flags; \
1297 \
1298 cpu_notifier_register_begin(); \
1299 fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE, \
1300 (void *)(unsigned long)cpu); \
1301 local_irq_save(flags); \
1302 fn(&fn##_nb, (unsigned long)CPU_STARTING, \
1303 (void *)(unsigned long)cpu); \
1304 local_irq_restore(flags); \
1305 fn(&fn##_nb, (unsigned long)CPU_ONLINE, \
1306 (void *)(unsigned long)cpu); \
1307 __register_cpu_notifier(&fn##_nb); \
1308 cpu_notifier_register_done(); \
1309} while (0)
1310
1311/*
1312 * Bare-bones version of perf_cpu_notifier(), which doesn't invoke the
1313 * callback for already online CPUs.
1314 */
1315#define __perf_cpu_notifier(fn) \
1316do { \
1317 static struct notifier_block fn##_nb = \
1318 { .notifier_call = fn, .priority = CPU_PRI_PERF }; \
1319 \
1320 __register_cpu_notifier(&fn##_nb); \
1321} while (0)
1322
1323struct perf_pmu_events_attr { 1288struct perf_pmu_events_attr {
1324 struct device_attribute attr; 1289 struct device_attribute attr;
1325 u64 id; 1290 u64 id;