diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /kernel/sysctl.c | |
| parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 84754f5801e6..6b6b727258b5 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -474,7 +474,7 @@ static struct ctl_table kern_table[] = { | |||
| 474 | .mode = 0644, | 474 | .mode = 0644, |
| 475 | .proc_handler = &proc_dointvec, | 475 | .proc_handler = &proc_dointvec, |
| 476 | }, | 476 | }, |
| 477 | #ifdef CONFIG_FTRACE | 477 | #ifdef CONFIG_FUNCTION_TRACER |
| 478 | { | 478 | { |
| 479 | .ctl_name = CTL_UNNUMBERED, | 479 | .ctl_name = CTL_UNNUMBERED, |
| 480 | .procname = "ftrace_enabled", | 480 | .procname = "ftrace_enabled", |