Merge branch 'tracing/ftrace' into tracing/urgent

This commit is contained in:
Ingo Molnar 2008-10-22 09:08:14 +02:00
commit debfcaf93e
40 changed files with 113 additions and 68 deletions

View file

@ -464,7 +464,7 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec,
},
#ifdef CONFIG_FTRACE
#ifdef CONFIG_FUNCTION_TRACER
{
.ctl_name = CTL_UNNUMBERED,
.procname = "ftrace_enabled",