Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26a9ba16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

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
parents 13b58926 c10edee2

init/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static void create_counter(int counter, int cpu, pid_t pid) 
	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
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ static void start_counter(int i, int counter) 
	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