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>

2 files changed, 7 insertions, 7 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)
                 return NULL;
         if ((s64)counter->hw_event.irq_period < 0)
                 return NULL;
-        if (!counter->hw_event.raw_type) {
-                ev = counter->hw_event.event_id;
+        if (!perf_event_raw(&counter->hw_event)) {
+                ev = perf_event_id(&counter->hw_event);
                 if (ev >= ppmu->n_generic || ppmu->generic_events[ev] == 0)
                         return NULL;
                 ev = ppmu->generic_events[ev];
         } else {
-                ev = counter->hw_event.raw_event_id;
+                ev = perf_event_config(&counter->hw_event);
         }
         counter->hw.config_base = ev;
         counter->hw.idx = 0;
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;