Commit 136e0b8e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 into perf/urgent

Fixes for some long standing problems.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 84f2b9b2 a4a03fc7

tools/perf/bench/mem-memcpy-x86-64-asm.S

+6 −0
Original line number Diff line number Diff line 


#include "../../../arch/x86/lib/memcpy_64.S"

/*

 * We need to provide note.GNU-stack section, saying that we want

 * NOT executable stack. Otherwise the final linking will assume that

 * the ELF stack should not be restricted at all and set it RWX.

 */

.section .note.GNU-stack,"",@progbits

tools/perf/util/event.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static int perf_event__process_kernel_mmap(struct perf_tool *tool __used, 


	is_kernel_mmap = memcmp(event->mmap.filename,

				kmmap_prefix,

				strlen(kmmap_prefix)) == 0;

				strlen(kmmap_prefix) - 1) == 0;

	if (event->mmap.filename[0] == '/' ||

	    (!is_kernel_mmap && event->mmap.filename[0] == '[')) {

tools/perf/util/evsel.c

+1 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ int perf_event__parse_sample(const union perf_event *event, u64 type, 
	memset(data, 0, sizeof(*data));

	data->cpu = data->pid = data->tid = -1;

	data->stream_id = data->id = data->time = -1ULL;

	data->period = 1;



	if (event->header.type != PERF_RECORD_SAMPLE) {

		if (!sample_id_all)