diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-03-23 13:22:06 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-06 03:30:25 -0400 |
commit | f4a2deb4860497f4332cf6a1acddab3dd628ddf0 (patch) | |
tree | 1655c7c000edce20d2c5b54cf12f99c23340371e /arch/powerpc/kernel/perf_counter.c | |
parent | af9522cf133e9be6da8525a46a9ed7e7659f0e1a (diff) |
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/powerpc/kernel/perf_counter.c')
-rw-r--r-- | arch/powerpc/kernel/perf_counter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c index 6413d9c0313b..d05651584d43 100644 --- a/arch/powerpc/kernel/perf_counter.c +++ b/arch/powerpc/kernel/perf_counter.c | |||
@@ -602,13 +602,13 @@ hw_perf_counter_init(struct perf_counter *counter) | |||
602 | return NULL; | 602 | return NULL; |
603 | if ((s64)counter->hw_event.irq_period < 0) | 603 | if ((s64)counter->hw_event.irq_period < 0) |
604 | return NULL; | 604 | return NULL; |
605 | if (!counter->hw_event.raw_type) { | 605 | if (!perf_event_raw(&counter->hw_event)) { |
606 | ev = counter->hw_event.event_id; | 606 | ev = perf_event_id(&counter->hw_event); |
607 | if (ev >= ppmu->n_generic || ppmu->generic_events[ev] == 0) | 607 | if (ev >= ppmu->n_generic || ppmu->generic_events[ev] == 0) |
608 | return NULL; | 608 | return NULL; |
609 | ev = ppmu->generic_events[ev]; | 609 | ev = ppmu->generic_events[ev]; |
610 | } else { | 610 | } else { |
611 | ev = counter->hw_event.raw_event_id; | 611 | ev = perf_event_config(&counter->hw_event); |
612 | } | 612 | } |
613 | counter->hw.config_base = ev; | 613 | counter->hw.config_base = ev; |
614 | counter->hw.idx = 0; | 614 | counter->hw.idx = 0; |