diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-17 04:01:34 -0500 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-17 04:01:34 -0500 |
| commit | bb9074ff58fe745e4f244f76209241909c82ec9c (patch) | |
| tree | cf6be00ab88b1e315f6b74a896a370440f677599 /init | |
| parent | 4739a9748e1bd7459f22f7e94e7d85710ca83954 (diff) | |
| parent | 156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff) | |
Merge commit 'v2.6.32-rc7'
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.
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 feb3b8f7e7ee..e50c63fb8839 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -938,7 +938,7 @@ config PERF_EVENTS | |||
| 938 | Enable kernel support for various performance events provided | 938 | Enable kernel support for various performance events provided |
| 939 | by software and hardware. | 939 | by software and hardware. |
| 940 | 940 | ||
| 941 | Software events are supported either build-in or via the | 941 | Software events are supported either built-in or via the |
| 942 | use of generic tracepoints. | 942 | use of generic tracepoints. |
| 943 | 943 | ||
| 944 | Most modern CPUs support performance events via performance | 944 | Most modern CPUs support performance events via performance |
| @@ -950,7 +950,7 @@ config PERF_EVENTS | |||
| 950 | used to profile the code that runs on that CPU. | 950 | used to profile the code that runs on that CPU. |
| 951 | 951 | ||
| 952 | The Linux Performance Event subsystem provides an abstraction of | 952 | The Linux Performance Event subsystem provides an abstraction of |
| 953 | these software and hardware cevent apabilities, available via a | 953 | these software and hardware event capabilities, available via a |
| 954 | system call and used by the "perf" utility in tools/perf/. It | 954 | system call and used by the "perf" utility in tools/perf/. It |
| 955 | provides per task and per CPU counters, and it provides event | 955 | provides per task and per CPU counters, and it provides event |
| 956 | capabilities on top of those. | 956 | capabilities on top of those. |