diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-15 22:58:06 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-15 22:58:06 +0200 |
| commit | 570f410b475b45462197d09ddca25e47616da5ac (patch) | |
| tree | b196be9183a2b8c1b032315ee1e0866f20aa9f50 /init | |
| parent | 01234e0fa6eb9b1cd0976d1fdcc52c56a613658a (diff) | |
| parent | 80acc63cc35078f79c9046ebda1c31de73042880 (diff) | |
| download | lwn-570f410b475b45462197d09ddca25e47616da5ac.tar.gz lwn-570f410b475b45462197d09ddca25e47616da5ac.zip | |
Merge branch 'rt/base' into rt/rt-2.6.31
Conflicts:
arch/x86/mm/highmem_32.c
kernel/irq/manage.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 28d331f8ddbb..71ac0ea0679b 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -942,6 +942,7 @@ menu "Performance Counters" config PERF_COUNTERS bool "Kernel Performance Counters" + default y if PROFILING depends on HAVE_PERF_COUNTERS select ANON_INODES help @@ -963,9 +964,17 @@ config PERF_COUNTERS Say Y if unsure. config EVENT_PROFILE - bool "Tracepoint profile sources" + bool "Tracepoint profiling sources" depends on PERF_COUNTERS && EVENT_TRACING default y + help + Allow the use of tracepoints as software performance counters. + + When this is enabled, you can create perf counters 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.) endmenu |