diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:15 -0500 |
| commit | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch) | |
| tree | dde815788aaea3e336aaaf24763311ce63a22e1b /init/Kconfig | |
| parent | 75639e7ee1401b3876c7a00ffe96ea8027668690 (diff) | |
| parent | d6797322231af98b9bb4afb175dd614cf511e5f7 (diff) | |
Merge branch 'topic/pcm-dma-fix' into topic/core-change
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 f51586406d62..9e03ef8b311e 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. |