diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
| commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
| tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /kernel/sysctl.c | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
| parent | 81520a1b0649d0701205b818714a8c1e1cfbbb5b (diff) | |
Merge branch 'tracing/ftrace' into tracing/urgent
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 b3cc73931d1f..edb1075f80d2 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -464,7 +464,7 @@ static struct ctl_table kern_table[] = { | |||
| 464 | .mode = 0644, | 464 | .mode = 0644, |
| 465 | .proc_handler = &proc_dointvec, | 465 | .proc_handler = &proc_dointvec, |
| 466 | }, | 466 | }, |
| 467 | #ifdef CONFIG_FTRACE | 467 | #ifdef CONFIG_FUNCTION_TRACER |
| 468 | { | 468 | { |
| 469 | .ctl_name = CTL_UNNUMBERED, | 469 | .ctl_name = CTL_UNNUMBERED, |
| 470 | .procname = "ftrace_enabled", | 470 | .procname = "ftrace_enabled", |