diff options
| author | Peter Zijlstra | 2009-03-23 18:22:06 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-04-06 09:30:25 +0200 |
| commit | f4a2deb4860497f4332cf6a1acddab3dd628ddf0 (patch) | |
| tree | 1655c7c000edce20d2c5b54cf12f99c23340371e /arch/x86/kernel/cpu/perf_counter.c | |
| parent | perf_counter tools: when no command is feed to perfstat, display help and exit (diff) | |
| download | kernel-qcow2-linux-f4a2deb4860497f4332cf6a1acddab3dd628ddf0.tar.gz kernel-qcow2-linux-f4a2deb4860497f4332cf6a1acddab3dd628ddf0.tar.xz kernel-qcow2-linux-f4a2deb4860497f4332cf6a1acddab3dd628ddf0.zip | |
perf_counter: remove the event config bitfields
Since the bitfields turned into a bit of a mess, remove them and rely on
good old masks.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Orig-LKML-Reference: <20090323172417.059499915@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_counter.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_counter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c index 902282d68b0c..3f95b0cdc550 100644 --- a/arch/x86/kernel/cpu/perf_counter.c +++ b/arch/x86/kernel/cpu/perf_counter.c @@ -217,15 +217,15 @@ static int __hw_perf_counter_init(struct perf_counter *counter) /* * Raw event type provide the config in the event structure */ - if (hw_event->raw_type) { - hwc->config |= pmc_ops->raw_event(hw_event->raw_event_id); + if (perf_event_raw(hw_event)) { + hwc->config |= pmc_ops->raw_event(perf_event_config(hw_event)); } else { - if (hw_event->event_id >= pmc_ops->max_events) + if (perf_event_id(hw_event) >= pmc_ops->max_events) return -EINVAL; /* * The generic map: */ - hwc->config |= pmc_ops->event_map(hw_event->event_id); + hwc->config |= pmc_ops->event_map(perf_event_id(hw_event)); } counter->wakeup_pending = 0; |