diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:20:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:20:25 -0500 |
| commit | 6556a6743549defc32e5f90ee2cb1ecd833a44c3 (patch) | |
| tree | 622306583d4a3c13235a8bfc012854c125c597f1 /init | |
| parent | e0d272429a34ff143bfa04ee8e29dd4eed2964c7 (diff) | |
| parent | 1dd2980d990068e20045b90c424518cc7f3657ff (diff) | |
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (172 commits)
perf_event, amd: Fix spinlock initialization
perf_event: Fix preempt warning in perf_clock()
perf tools: Flush maps on COMM events
perf_events, x86: Split PMU definitions into separate files
perf annotate: Handle samples not at objdump output addr boundaries
perf_events, x86: Remove superflous MSR writes
perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in()
perf_events, x86: AMD event scheduling
perf_events: Add new start/stop PMU callbacks
perf_events: Report the MMAP pgoff value in bytes
perf annotate: Defer allocating sym_priv->hist array
perf symbols: Improve debugging information about symtab origins
perf top: Use a macro instead of a constant variable
perf symbols: Check the right return variable
perf/scripts: Tag syscall_name helper as not yet available
perf/scripts: Add perf-trace-python Documentation
perf/scripts: Remove unnecessary PyTuple resizes
perf/scripts: Add syscall tracing scripts
perf/scripts: Add Python scripting engine
perf/scripts: Remove check-perf-trace from listed scripts
...
Fix trivial conflict in tools/perf/util/probe-event.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/init/Kconfig b/init/Kconfig index 207ae29354a3..c6d95f8ea055 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -992,19 +992,6 @@ config PERF_EVENTS | |||
| 992 | 992 | ||
| 993 | Say Y if unsure. | 993 | Say Y if unsure. |
| 994 | 994 | ||
| 995 | config EVENT_PROFILE | ||
| 996 | bool "Tracepoint profiling sources" | ||
| 997 | depends on PERF_EVENTS && EVENT_TRACING | ||
| 998 | default y | ||
| 999 | help | ||
| 1000 | Allow the use of tracepoints as software performance events. | ||
| 1001 | |||
| 1002 | When this is enabled, you can create perf events based on | ||
| 1003 | tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID | ||
| 1004 | found in debugfs://tracing/events/*/*/id. (The -e/--events | ||
| 1005 | option to the perf tool can parse and interpret symbolic | ||
| 1006 | tracepoints, in the subsystem:tracepoint_name format.) | ||
| 1007 | |||
| 1008 | config PERF_COUNTERS | 995 | config PERF_COUNTERS |
| 1009 | bool "Kernel performance counters (old config option)" | 996 | bool "Kernel performance counters (old config option)" |
| 1010 | depends on HAVE_PERF_EVENTS | 997 | depends on HAVE_PERF_EVENTS |