[GIT pull] perf fixes for 4.11

[Thomas Gleixner <tglx@linutronix.de>]

Linus,

please pull the latest perf-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus

Two small fixes for perf:

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

  - Add the missing initialization to the LBR entries to avoid exposing
    random or stale data.

Thanks,

	tglx

------------------>
Christian Borntraeger (1):
      perf annotate s390: Fix perf annotate error -95 (4.10 regression)

Peter Zijlstra (1):
      perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32()


 arch/x86/events/intel/lbr.c | 3 +++
 tools/perf/util/annotate.c  | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index 81b321ace8e0..f924629836a8 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -507,6 +507,9 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc)
 		cpuc->lbr_entries[i].to		= msr_lastbranch.to;
 		cpuc->lbr_entries[i].mispred	= 0;
 		cpuc->lbr_entries[i].predicted	= 0;
+		cpuc->lbr_entries[i].in_tx	= 0;
+		cpuc->lbr_entries[i].abort	= 0;
+		cpuc->lbr_entries[i].cycles	= 0;
 		cpuc->lbr_entries[i].reserved	= 0;
 	}
 	cpuc->lbr_stack.nr = i;
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 273f21fa32b5..7aa57225cbf7 100644
--- 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)