Merge tag 'perf-urgent-for-mingo-4.11-20170411' of git://git.kernel.o…

…rg/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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
ambv · Apr 11, 2017 · 0718b33 · 0718b33
2 parents c08e611 + 3c1a427
commit 0718b33
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
@@ -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)