diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 14:29:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 14:29:34 -0500 |
| commit | 26a9ba160f50115ece48198608002600914932a7 (patch) | |
| tree | bcbc9be816e0282c0e33822b897489ca74a3e54f /init/Kconfig | |
| parent | 13b5892672073b1169b3b60b8a57123fb32c9df1 (diff) | |
| parent | c10edee2e1716f8cf217cf52ed01ae4742fcdf3c (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Fix permission checks
perf_events: Fix some typo in the perf events config description
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index f51586406d6..9e03ef8b311 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -937,7 +937,7 @@ config PERF_EVENTS | |||
| 937 | Enable kernel support for various performance events provided | 937 | Enable kernel support for various performance events provided |
| 938 | by software and hardware. | 938 | by software and hardware. |
| 939 | 939 | ||
| 940 | Software events are supported either build-in or via the | 940 | Software events are supported either built-in or via the |
| 941 | use of generic tracepoints. | 941 | use of generic tracepoints. |
| 942 | 942 | ||
| 943 | Most modern CPUs support performance events via performance | 943 | Most modern CPUs support performance events via performance |
| @@ -949,7 +949,7 @@ config PERF_EVENTS | |||
| 949 | used to profile the code that runs on that CPU. | 949 | used to profile the code that runs on that CPU. |
| 950 | 950 | ||
| 951 | The Linux Performance Event subsystem provides an abstraction of | 951 | The Linux Performance Event subsystem provides an abstraction of |
| 952 | these software and hardware cevent apabilities, available via a | 952 | these software and hardware event capabilities, available via a |
| 953 | system call and used by the "perf" utility in tools/perf/. It | 953 | system call and used by the "perf" utility in tools/perf/. It |
| 954 | provides per task and per CPU counters, and it provides event | 954 | provides per task and per CPU counters, and it provides event |
| 955 | capabilities on top of those. | 955 | capabilities on top of those. |