From: Greg Kroah-Hartman Date: Tue, 23 Apr 2013 20:32:54 +0000 (-0700) Subject: fix up 3.4 patch X-Git-Tag: v3.8.9~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=509e55501c8dd780adcf8149a8f11f61fc6b2f42;p=thirdparty%2Fkernel%2Fstable-queue.git fix up 3.4 patch --- diff --git a/queue-3.4/perf-x86-fix-offcore_rsp-valid-mask-for-snb-ivb.patch b/queue-3.4/perf-x86-fix-offcore_rsp-valid-mask-for-snb-ivb.patch index 523d5a3276d..fbb840e8f62 100644 --- a/queue-3.4/perf-x86-fix-offcore_rsp-valid-mask-for-snb-ivb.patch +++ b/queue-3.4/perf-x86-fix-offcore_rsp-valid-mask-for-snb-ivb.patch @@ -31,8 +31,8 @@ Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- - arch/x86/kernel/cpu/perf_event_intel.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) + arch/x86/kernel/cpu/perf_event_intel.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c @@ -53,10 +53,11 @@ Signed-off-by: Greg Kroah-Hartman EVENT_EXTRA_END }; -@@ -1852,6 +1858,10 @@ __init int intel_pmu_init(void) +@@ -1851,7 +1857,10 @@ __init int intel_pmu_init(void) + x86_pmu.event_constraints = intel_snb_event_constraints; x86_pmu.pebs_constraints = intel_snb_pebs_event_constraints; - x86_pmu.extra_regs = intel_snb_extra_regs; +- x86_pmu.extra_regs = intel_snb_extra_regs; + if (boot_cpu_data.x86_model == 45) + x86_pmu.extra_regs = intel_snbep_extra_regs; + else