diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-11-30 19:18:06 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-11-30 19:18:06 +0200 |
| commit | 3ca05e47275843eacefb421f08fd085e67cf302a (patch) | |
| tree | e298f4cb466159166b86e562347eea7e06617007 /init | |
| parent | fadade112761433c55e0fc4a23abb3a76075127b (diff) | |
| parent | ce79ddc8e2376a9a93c7d42daf89bfcbb9187e62 (diff) | |
Merge branch 'slab/fixes' into for-next
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 3fbaee7b3ad2..3530a7ace96f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -937,7 +937,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 @@ -949,7 +949,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. |