perf events fixes
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Pekka Enberg (1):
perf tools: Fix permission checks
Thadeu Lima de Souza Cascardo (1):
perf_events: Fix some typo in the perf events config description
init/Kconfig | 4 ++-- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-top.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
init/Kconfig +2 -2
@@ -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.
tools/perf/builtin-record.c +1 -1
@@ -426,7 +426,7 @@ try_again:if (fd[nr_cpu][counter] <0 ) {int err = errno; -if (err ==EPERM ) +if (err ==EPERM || err ==EACCES )die ("Permission error - are you root?\n" );else if (err ==ENODEV && profile_cpu !=-1 )die ("No such device - did you specify an out-of-range profile CPU?\n" );
tools/perf/builtin-top.c +1 -1
@@ -1027,7 +1027,7 @@ try_again:if (fd[i][counter] <0 ) {int err = errno; -if (err ==EPERM ) +if (err ==EPERM || err ==EACCES )die ("No permission - are you root?\n" );/* * If it's cycles then fall back to hrtimer