projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tracing/ftrace' into tracing/urgent
[linux-2.6-block.git]
/
kernel
/
sysctl.c
diff --git
a/kernel/sysctl.c
b/kernel/sysctl.c
index b3cc73931d1f6411c6e99faf205124987d4a887e..edb1075f80d23120219f16ba899b5078b706462c 100644
(file)
--- a/
kernel/sysctl.c
+++ b/
kernel/sysctl.c
@@
-464,7
+464,7
@@
static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec,
},
-#ifdef CONFIG_F
TRACE
+#ifdef CONFIG_F
UNCTION_TRACER
{
.ctl_name = CTL_UNNUMBERED,
.procname = "ftrace_enabled",