dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ftrace: fix trace_nop config select
  ftrace: perform an initialization for ftrace to enable it
This commit is contained in:
Linus Torvalds 2008-10-30 11:44:09 -07:00
parent effdb9492d f3384b28a0
commit 0b54968f66
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/Kconfig
View File

@ -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"

8
kernel/trace/ftrace.c
View File

@ -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)