Commit 0718b334 authored Apr 11, 2017 by Ingo Molnar

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

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

 into perf/urgent

Pull 'perf annotate' fix for s390:

- The move to support cross arch annotation introduced per arch
  initialization requirements, fullfill them for s/390 (Christian Borntraeger)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents c08e611b 3c1a4279

tools/perf/util/annotate.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,12 @@ static struct arch architectures[] = {
		.name = "powerpc",
		.init = powerpc__annotate_init,
		},
		{
		.name = "s390",
		.objdump = {
		.comment_char = '#',
		},
		},
		};

		static void ins__delete(struct ins_operands *ops)