diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-17 19:09:09 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-10-17 19:12:33 -0400 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /arch/Kconfig | |
| parent | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (diff) | |
| parent | f39cdf25bf77219676ec5360980ac40b1a7e144a (diff) | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 8847f47aa82c..acb664397945 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -9,6 +9,7 @@ config OPROFILE | |||
| 9 | depends on TRACING_SUPPORT | 9 | depends on TRACING_SUPPORT |
| 10 | select TRACING | 10 | select TRACING |
| 11 | select RING_BUFFER | 11 | select RING_BUFFER |
| 12 | select RING_BUFFER_ALLOW_SWAP | ||
| 12 | help | 13 | help |
| 13 | OProfile is a profiling system capable of profiling the | 14 | OProfile is a profiling system capable of profiling the |
| 14 | whole system, include the kernel, kernel modules, libraries, | 15 | whole system, include the kernel, kernel modules, libraries, |