Merge branch 'linus' into tracing/ftrace

This commit is contained in:
Ingo Molnar 2008-10-31 00:38:21 +01:00
commit e1e302d8a9
371 changed files with 5975 additions and 2447 deletions

View file

@ -474,7 +474,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",