diff options
| author | Linus Torvalds | 2014-12-16 12:53:59 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2014-12-16 12:53:59 -0800 |
| commit | a7c180aa7e76a55642e8492f28353303a50292c2 (patch) | |
| tree | b80b3575f1717a5e3a07081b5c9409805662490d /init | |
| parent | 2dbfca5a181973558277b28b1f4c36362291f5e0 (diff) | |
| parent | 0daa2302968c13b657118d6ac92471f8fd2f3f28 (diff) | |
Merge tag 'trace-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing updates from Steven Rostedt:
"As the merge window is still open, and this code was not as complex as
I thought it might be. I'm pushing this in now.
This will allow Thomas to debug his irq work for 3.20.
This adds two new features:
1) Allow traceopoints to be enabled right after mm_init().
By passing in the trace_event= kernel command line parameter,
tracepoints can be enabled at boot up. For debugging things like
the initialization of interrupts, it is needed to have tracepoints
enabled very early. People have asked about this before and this
has been on my todo list. As it can be helpful for Thomas to debug
his upcoming 3.20 IRQ work, I'm pushing this now. This way he can
add tracepoints into the IRQ set up and have users enable them when
things go wrong.
2) Have the tracepoints printed via printk() (the console) when they
are triggered.
If the irq code locks up or reboots the box, having the tracepoint
output go into the kernel ring buffer is useless for debugging.
But being able to add the tp_printk kernel command line option
along with the trace_event= option will have these tracepoints
printed as they occur, and that can be really useful for debugging
early lock up or reboot problems.
This code is not that intrusive and it passed all my tests. Thomas
tried them out too and it works for his needs.
Link: http://lkml.kernel.org/r/20141214201609.126831471@goodmis.org"
* tag 'trace-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Add tp_printk cmdline to have tracepoints go to printk()
tracing: Move enabling tracepoints to just after rcu_init()
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 8a914b758e5d..747ecc4c0a19 100644 --- a/init/main.c +++ b/init/main.c @@ -578,6 +578,10 @@ asmlinkage __visible void __init start_kernel(void) local_irq_disable(); idr_init_cache(); rcu_init(); + + /* trace_printk() and trace points may be used after this */ + trace_init(); + context_tracking_init(); radix_tree_init(); /* init some links before init_ISA_irqs() */ |