tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into tracing/ftrace

Browse Source
This commit is contained in:
Ingo Molnar
2008-10-31 00:38:21 +01:00
parent 944ac4259e 7f82f000ed
commit e1e302d8a9
371 changed files with 5981 additions and 2453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/sysctl.c
+1 -1
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",