Commit 8c1df400 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/core' of... 

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
parents 6c529a26 21dd9ae5

tools/perf/Documentation/perf-diff.txt

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ OPTIONS 
--force::

       Don't complain, do it.



--symfs=<directory>::

        Look for files with symbols relative to this directory.



SEE ALSO

--------

tools/perf/Documentation/perf-probe.txt

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ LINE SYNTAX 
-----------

Line range is described by following syntax.



 "FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]"

 "FUNC[:RLN[+NUM|-RLN2]]|SRC[:ALN[+NUM|-ALN2]]"



FUNC specifies the function name of showing lines. 'RLN' is the start line

number from function entry line, and 'RLN2' is the end line number. As same as

tools/perf/Documentation/perf-report.txt

+3 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ OPTIONS 
--force::

        Don't complain, do it.



--symfs=<directory>::

        Look for files with symbols relative to this directory.



SEE ALSO

--------

linkperf:perf-stat[1]

tools/perf/Documentation/perf-timechart.txt

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ OPTIONS 
--process::

        Select the processes to display, by name or PID



--symfs=<directory>::

        Look for files with symbols relative to this directory.



SEE ALSO

--------

tools/perf/builtin-annotate.c

+3 −1
Original line number Diff line number Diff line
@@ -375,6 +375,8 @@ static struct perf_event_ops event_ops = { 
	.mmap	= event__process_mmap,

	.comm	= event__process_comm,

	.fork	= event__process_task,

	.ordered_samples = true,

	.ordering_requires_timestamps = true,

};



static int __cmd_annotate(void)
@@ -382,7 +384,7 @@ static int __cmd_annotate(void) 
	int ret;

	struct perf_session *session;



	session = perf_session__new(input_name, O_RDONLY, force, false);

	session = perf_session__new(input_name, O_RDONLY, force, false, &event_ops);

	if (session == NULL)

		return -ENOMEM;