Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Two x86 Intel PMU constraint handling fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel: Fix Haswell CYCLE_ACTIVITY.* counter constraints
perf/x86/intel: Filter branches for PEBS event
+5
-5
+5
-5
arch/x86/kernel/cpu/perf_event_intel.c
+5
-5
arch/x86/kernel/cpu/perf_event_intel.c
···
212
212
INTEL_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PREC_DIST */
213
213
INTEL_EVENT_CONSTRAINT(0xcd, 0x8), /* MEM_TRANS_RETIRED.LOAD_LATENCY */
214
214
/* CYCLE_ACTIVITY.CYCLES_L1D_PENDING */
215
-
INTEL_EVENT_CONSTRAINT(0x08a3, 0x4),
215
+
INTEL_UEVENT_CONSTRAINT(0x08a3, 0x4),
216
216
/* CYCLE_ACTIVITY.STALLS_L1D_PENDING */
217
-
INTEL_EVENT_CONSTRAINT(0x0ca3, 0x4),
217
+
INTEL_UEVENT_CONSTRAINT(0x0ca3, 0x4),
218
218
/* CYCLE_ACTIVITY.CYCLES_NO_EXECUTE */
219
-
INTEL_EVENT_CONSTRAINT(0x04a3, 0xf),
219
+
INTEL_UEVENT_CONSTRAINT(0x04a3, 0xf),
220
220
EVENT_CONSTRAINT_END
221
221
};
222
222
···
1649
1649
if (c)
1650
1650
return c;
1651
1651
1652
-
c = intel_pebs_constraints(event);
1652
+
c = intel_shared_regs_constraints(cpuc, event);
1653
1653
if (c)
1654
1654
return c;
1655
1655
1656
-
c = intel_shared_regs_constraints(cpuc, event);
1656
+
c = intel_pebs_constraints(event);
1657
1657
if (c)
1658
1658
return c;
1659
1659