summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-01-07 16:10:00 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-01-07 16:10:00 +1100
commit1d7ef8fdb754ae3b58b4986d1969ef84be9931e5 (patch)
tree8f3a58b206c5ec731e060b8c90b98c8c4ad56f4f /init
parentbf4458cc60b51d548d5df87cb05fe1c89eae9b3c (diff)
parentc15b1841881aa96b0eb364fa51f18de3de52873e (diff)
Merge remote branch 'tip/auto-latest'
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig13
1 files changed, 0 insertions, 13 deletions
diff --git a/init/Kconfig b/init/Kconfig
index ee33cc63ced5..8f55f9e7463b 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -978,19 +978,6 @@ config PERF_EVENTS
Say Y if unsure.
-config EVENT_PROFILE
- bool "Tracepoint profiling sources"
- depends on PERF_EVENTS && EVENT_TRACING
- default y
- help
- Allow the use of tracepoints as software performance events.
-
- When this is enabled, you can create perf events based on
- tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID
- found in debugfs://tracing/events/*/*/id. (The -e/--events
- option to the perf tool can parse and interpret symbolic
- tracepoints, in the subsystem:tracepoint_name format.)
-
config PERF_COUNTERS
bool "Kernel performance counters (old config option)"
depends on HAVE_PERF_EVENTS