fix 3.18 patch build

diff --git a/queue-3.18/perf-x86-avoid-exposing-wrong-stale-data-in-intel_pmu_lbr_read_32.patch b/queue-3.18/perf-x86-avoid-exposing-wrong-stale-data-in-intel_pmu_lbr_read_32.patch
index 7d201f923ed9f040ef61b9ed80e793b6cac8bfe5..c6753f92315e0e70a39c373f860049cb1ad56e0b 100644 (file)
--- a/queue-3.18/perf-x86-avoid-exposing-wrong-stale-data-in-intel_pmu_lbr_read_32.patch
+++ b/queue-3.18/perf-x86-avoid-exposing-wrong-stale-data-in-intel_pmu_lbr_read_32.patch
@@ -20,18 +20,17 @@ Signed-off-by: Ingo Molnar <mingo@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- arch/x86/kernel/cpu/perf_event_intel_lbr.c |    3 +++
- 1 file changed, 3 insertions(+)
+ arch/x86/kernel/cpu/perf_event_intel_lbr.c |    2 ++
+ 1 file changed, 2 insertions(+)
 
 --- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c
 +++ b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
-@@ -268,6 +268,9 @@ static void intel_pmu_lbr_read_32(struct
+@@ -268,6 +268,8 @@ static void intel_pmu_lbr_read_32(struct
                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;