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

Commit cefec668 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.12-20170504' of... 

Merge tag 'perf-urgent-for-mingo-4.12-20170504' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

User visible changes:

- Fix AArch64 objdump disasm comment char in 'perf annotate' (Kim Phillips)

- Fix documentation spelling mistakes (Kim Phillips)

- Don't fail 'perf test kmod-path' if compressed modules aren't
  supported (Kim Phillips)

Infrastructure changes:

- Fix sched_getcpu() feature test when included in test-all.c redefining
  _GNU_SOURCE (Arnaldo Carvalho de Melo)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 12c1c2fd 1e6e7eae

tools/build/feature/test-sched_getcpu.c

+2 −0
Original line number Diff line number Diff line 
#ifndef _GNU_SOURCE

#define _GNU_SOURCE

#endif

#include <sched.h>



int main(void)

tools/perf/Documentation/perf-c2c.txt

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ REPORT OPTIONS 


-c::

--coalesce::

	Specify sorintg fields for single cacheline display.

	Specify sorting fields for single cacheline display.

	Following fields are available: tid,pid,iaddr,dso

	(see COALESCE)
@@ -106,7 +106,7 @@ REPORT OPTIONS 


-d::

--display::

	Siwtch to HITM type (rmt, lcl) to display and sort on. Total HITMs as default.

	Switch to HITM type (rmt, lcl) to display and sort on. Total HITMs as default.



C2C RECORD

----------

tools/perf/Documentation/perf-record.txt

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ OPTIONS 
	the libunwind or libdw library) should be used instead.

	Using the "lbr" method doesn't require any compiler options. It

	will produce call graphs from the hardware LBR registers. The

	main limition is that it is only available on new Intel

	main limitation is that it is only available on new Intel

	platforms, such as Haswell. It can only get user call chain. It

	doesn't work with branch stack sampling at the same time.

tools/perf/Documentation/perf-report.txt

+3 −3
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ OPTIONS 
--parent=<regex>::

        A regex filter to identify parent. The parent is a caller of this

	function and searched through the callchain, thus it requires callchain

	information recorded. The pattern is in the exteneded regex format and

	information recorded. The pattern is in the extended regex format and

	defaults to "\^sys_|^do_page_fault", see '--sort parent'.



-x::
@@ -207,8 +207,8 @@ OPTIONS 
-g::

--call-graph=<print_type,threshold[,print_limit],order,sort_key[,branch],value>::

        Display call chains using type, min percent threshold, print limit,

	call order, sort key, optional branch and value.  Note that ordering of

	parameters is not fixed so any parement can be given in an arbitraty order.

	call order, sort key, optional branch and value.  Note that ordering

	is not fixed so any parameter can be given in an arbitrary order.

	One exception is the print_limit which should be preceded by threshold.



	print_type can be either:

tools/perf/Documentation/perf.data-file-format.txt

+2 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ When the event stream contains multiple events each event is identified 
by an ID. This can be either through the PERF_SAMPLE_ID or the

PERF_SAMPLE_IDENTIFIER header. The PERF_SAMPLE_IDENTIFIER header is

at a fixed offset from the event header, which allows reliable

parsing of the header. Relying on ID may be ambigious.

parsing of the header. Relying on ID may be ambiguous.

IDENTIFIER is only supported by newer Linux kernels.



Perf record specific events:
@@ -288,7 +288,7 @@ struct attr_event { 
	uint64_t id[];

};



	PERF_RECORD_HEADER_EVENT_TYPE		= 65, /* depreceated */

	PERF_RECORD_HEADER_EVENT_TYPE		= 65, /* deprecated */



#define MAX_EVENT_NAME 64