diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2010-11-04 18:33:01 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-11-12 08:51:55 -0500 |
| commit | 3c502e7a0255d82621ff25d60cc816624830497e (patch) | |
| tree | 1f30638f22ef9ed748fac1f73cb18169efe49ae7 /kernel/perf_event.c | |
| parent | 6c0aca288e726405b01dacb12cac556454d34b2a (diff) | |
perf,hw_breakpoint: Initialize hardware api earlier
When using early debugging, the kernel does not initialize the
hw_breakpoint API early enough and causes the late initialization of
the kernel debugger to fail. The boot arguments are:
earlyprintk=vga ekgdboc=kbd kgdbwait
Then simply type "go" at the kdb prompt and boot. The kernel will
later emit the message:
kgdb: Could not allocate hwbreakpoints
And at that point the kernel debugger will cease to work correctly.
The solution is to initialize the hw_breakpoint at the same time that
all the other perf call backs are initialized instead of using a
core_initcall() initialization which happens well after the kernel
debugger can make use of hardware breakpoints.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
CC: Frederic Weisbecker <fweisbec@gmail.com>
CC: Ingo Molnar <mingo@elte.hu>
CC: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <4CD3396D.1090308@windriver.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
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 517d827f4982..05b7d8c72c6c 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/kernel_stat.h> | 31 | #include <linux/kernel_stat.h> |
| 32 | #include <linux/perf_event.h> | 32 | #include <linux/perf_event.h> |
| 33 | #include <linux/ftrace_event.h> | 33 | #include <linux/ftrace_event.h> |
| 34 | #include <linux/hw_breakpoint.h> | ||
| 34 | 35 | ||
| 35 | #include <asm/irq_regs.h> | 36 | #include <asm/irq_regs.h> |
| 36 | 37 | ||
| @@ -6295,6 +6296,8 @@ perf_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) | |||
| 6295 | 6296 | ||
| 6296 | void __init perf_event_init(void) | 6297 | void __init perf_event_init(void) |
| 6297 | { | 6298 | { |
| 6299 | int ret; | ||
| 6300 | |||
| 6298 | perf_event_init_all_cpus(); | 6301 | perf_event_init_all_cpus(); |
| 6299 | init_srcu_struct(&pmus_srcu); | 6302 | init_srcu_struct(&pmus_srcu); |
| 6300 | perf_pmu_register(&perf_swevent); | 6303 | perf_pmu_register(&perf_swevent); |
| @@ -6302,4 +6305,7 @@ void __init perf_event_init(void) | |||
| 6302 | perf_pmu_register(&perf_task_clock); | 6305 | perf_pmu_register(&perf_task_clock); |
| 6303 | perf_tp_register(); | 6306 | perf_tp_register(); |
| 6304 | perf_cpu_notifier(perf_cpu_notify); | 6307 | perf_cpu_notifier(perf_cpu_notify); |
| 6308 | |||
| 6309 | ret = init_hw_breakpoint(); | ||
| 6310 | WARN(ret, "hw_breakpoint initialization failed with: %d", ret); | ||
| 6305 | } | 6311 | } |
