diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-18 10:37:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 10:37:51 +0100 |
| commit | fcf48a725a176ba12aa7be64c50190deaa2f86df (patch) | |
| tree | 5d611ba5b1eb4dd821c93ca2f9d08078b563305a /kernel/perf_event.c | |
| parent | x86, hw_nmi: Move backtrace_mask declaration under ARCH_HAS_NMI_WATCHDOG (diff) | |
| parent | perf,hw_breakpoint: Initialize hardware api earlier (diff) | |
| download | linux-fcf48a725a176ba12aa7be64c50190deaa2f86df.tar.xz linux-fcf48a725a176ba12aa7be64c50190deaa2f86df.zip | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index cb6c0d2af68f..f818d9d2dc93 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -31,6 +31,7 @@ #include <linux/kernel_stat.h> #include <linux/perf_event.h> #include <linux/ftrace_event.h> +#include <linux/hw_breakpoint.h> #include <asm/irq_regs.h> @@ -6321,6 +6322,8 @@ perf_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) void __init perf_event_init(void) { + int ret; + perf_event_init_all_cpus(); init_srcu_struct(&pmus_srcu); perf_pmu_register(&perf_swevent); @@ -6328,4 +6331,7 @@ void __init perf_event_init(void) perf_pmu_register(&perf_task_clock); perf_tp_register(); perf_cpu_notifier(perf_cpu_notify); + + ret = init_hw_breakpoint(); + WARN(ret, "hw_breakpoint initialization failed with: %d", ret); } |