diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-19 06:48:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-19 06:48:09 -0400 |
| commit | c8710ad38900153af7a3e6762e99c062cfa46443 (patch) | |
| tree | a0c0632274c4eb72f51e99a5861f71cffe65ea60 /include/linux/perf_event.h | |
| parent | 6016ee13db518ab1cd0cbf43fc2ad5712021e338 (diff) | |
| parent | 86397dc3ccfc0e17b7550d05eaf15fe91f6498dd (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index ae6fa6050925..000610c4de71 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
| @@ -1083,7 +1083,7 @@ static inline void perf_event_disable(struct perf_event *event) { } | |||
| 1083 | #define perf_cpu_notifier(fn) \ | 1083 | #define perf_cpu_notifier(fn) \ |
| 1084 | do { \ | 1084 | do { \ |
| 1085 | static struct notifier_block fn##_nb __cpuinitdata = \ | 1085 | static struct notifier_block fn##_nb __cpuinitdata = \ |
| 1086 | { .notifier_call = fn, .priority = 20 }; \ | 1086 | { .notifier_call = fn, .priority = CPU_PRI_PERF }; \ |
| 1087 | fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE, \ | 1087 | fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE, \ |
| 1088 | (void *)(unsigned long)smp_processor_id()); \ | 1088 | (void *)(unsigned long)smp_processor_id()); \ |
| 1089 | fn(&fn##_nb, (unsigned long)CPU_STARTING, \ | 1089 | fn(&fn##_nb, (unsigned long)CPU_STARTING, \ |