aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-11 11:29:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-11 11:29:34 -0800
commit26a9ba160f50115ece48198608002600914932a7 (patch)
treebcbc9be816e0282c0e33822b897489ca74a3e54f /init/Kconfig
parent13b5892672073b1169b3b60b8a57123fb32c9df1 (diff)
parentc10edee2e1716f8cf217cf52ed01ae4742fcdf3c (diff)
downloadmrst-s0i3-test-26a9ba160f50115ece48198608002600914932a7.tar.gz
mrst-s0i3-test-26a9ba160f50115ece48198608002600914932a7.tar.xz
mrst-s0i3-test-26a9ba160f50115ece48198608002600914932a7.zip
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/Kconfig4
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
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.