diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-03-04 04:40:22 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-03-04 04:40:25 -0500 |
commit | 888a8a3e9d79cbb9d83e53955f684998248580ec (patch) | |
tree | 3dbf548438c77d89c8696a9a79c4129cdc2f3d3e /arch/x86/kernel/cpu/perf_event.c | |
parent | cfff2d909cbdaf8c467bd321aa0502a548ec8f7e (diff) | |
parent | b06b3d49699a52e8f9ca056c4f96e81b1987d78e (diff) |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up updates before queueing up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 10bfe2472d1..ea03c725e46 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -166,8 +166,10 @@ struct cpu_hw_events { | |||
166 | /* | 166 | /* |
167 | * Constraint on the Event code + UMask | 167 | * Constraint on the Event code + UMask |
168 | */ | 168 | */ |
169 | #define PEBS_EVENT_CONSTRAINT(c, n) \ | 169 | #define INTEL_UEVENT_CONSTRAINT(c, n) \ |
170 | EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK) | 170 | EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK) |
171 | #define PEBS_EVENT_CONSTRAINT(c, n) \ | ||
172 | INTEL_UEVENT_CONSTRAINT(c, n) | ||
171 | 173 | ||
172 | #define EVENT_CONSTRAINT_END \ | 174 | #define EVENT_CONSTRAINT_END \ |
173 | EVENT_CONSTRAINT(0, 0, 0) | 175 | EVENT_CONSTRAINT(0, 0, 0) |