diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-03 09:12:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-03 09:12:18 +0100 |
| commit | c2d80e335d02cd8935802788eb1e7861817709e8 (patch) | |
| tree | 86b0942a2feca23fcde7ad252e6bc539a069ab98 /init | |
| parent | fe35071499dcef188862653fd013aa50f76ef94f (diff) | |
| parent | dd77038d233d106f297b907bf51459dfb1099eb1 (diff) | |
Merge branch 'perf/urgent' into auto-latest
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index a2a30d94944a..216f7f8436b2 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -946,7 +946,7 @@ config PERF_EVENTS Enable kernel support for various performance events provided by software and hardware. - Software events are supported either build-in or via the + Software events are supported either built-in or via the use of generic tracepoints. Most modern CPUs support performance events via performance @@ -958,7 +958,7 @@ config PERF_EVENTS used to profile the code that runs on that CPU. The Linux Performance Event subsystem provides an abstraction of - these software and hardware cevent apabilities, available via a + these software and hardware event capabilities, available via a system call and used by the "perf" utility in tools/perf/. It provides per task and per CPU counters, and it provides event capabilities on top of those. |