diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:50:48 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:50:48 +0200 |
commit | 2257e268b1154966c5b0141b23695db1043ff39d (patch) | |
tree | dae4b032afb9872568cf7921b39d30c79a6c3fee /arch/x86/events/perf_event.h | |
parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/perf_event.h')
-rw-r--r-- | arch/x86/events/perf_event.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index 53728eea1bed..476aec3a4cab 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -879,6 +879,8 @@ extern struct event_constraint intel_slm_pebs_event_constraints[]; extern struct event_constraint intel_glm_pebs_event_constraints[]; +extern struct event_constraint intel_glp_pebs_event_constraints[]; + extern struct event_constraint intel_nehalem_pebs_event_constraints[]; extern struct event_constraint intel_westmere_pebs_event_constraints[]; |