diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-12 10:53:33 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-12 10:53:33 +0200 |
| commit | bda9263432072d7879fe13fdaf9dbbd372b4d2fc (patch) | |
| tree | f5619916e1e251b4ce4636d27eb3c591c871a832 /init | |
| parent | e27d6cbf38b67bcc2cb23b59c109b7df0fde7f1e (diff) | |
| parent | 7cb7beb31aa3d941833b6a6e553687422c31e4b6 (diff) | |
| download | lwn-bda9263432072d7879fe13fdaf9dbbd372b4d2fc.tar.gz lwn-bda9263432072d7879fe13fdaf9dbbd372b4d2fc.zip | |
Merge branch 'linus' into rt/base
Conflicts:
kernel/perf_counter.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 c6035d4ab646..06712e2359b7 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 |