tracing fixlets
Linus,
Please pull the latest tracing-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus
Thanks,
Ingo
------------------>
Frederic Weisbecker (1):
ftrace: perform an initialization for ftrace to enable it
Steven Rostedt (1):
ftrace: fix trace_nop config select
kernel/trace/Kconfig | 2 +- kernel/trace/ftrace.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-)
kernel/trace/Kconfig +1 -1
@@ -8,7 +8,6 @@ config NOP_TRACER config HAVE_FUNCTION_TRACER bool - select NOP_TRACER config HAVE_DYNAMIC_FTRACE bool
@@ -28,6 +27,7 @@ config TRACING select RING_BUFFER select STACKTRACE select TRACEPOINTS + select NOP_TRACER menu "Tracers"
kernel/trace/ftrace.c +8 -0
@@ -1339,6 +1339,14 @@ void __init ftrace_init(void) }#else + +static int __init ftrace_nodyn_init (void ) +{ + ftrace_enabled =1 ; +return 0 ; +} +device_initcall (ftrace_nodyn_init); +# define ftrace_startup () do { } while (0)# define ftrace_shutdown () do { } while (0)# define ftrace_startup_sysctl () do { } while (0)