2 files changed, 7 insertions, 7 deletions

diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c
index 232b00a36f79..4786ad9a2887 100644
--- a/arch/powerpc/kernel/perf_counter.c
+++ b/arch/powerpc/kernel/perf_counter.c
@@ -867,13 +867,13 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter)
 
         if (!ppmu)
                 return ERR_PTR(-ENXIO);
-        if (!perf_event_raw(&counter->attr)) {
-                ev = perf_event_id(&counter->attr);
+        if (counter->attr.type != PERF_TYPE_RAW) {
+                ev = counter->attr.config;
                 if (ev >= ppmu->n_generic || ppmu->generic_events[ev] == 0)
                         return ERR_PTR(-EOPNOTSUPP);
                 ev = ppmu->generic_events[ev];
         } else {
-                ev = perf_event_config(&counter->attr);
+                ev = counter->attr.config;
         }
         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 8f53f3a7da29..430e048f2854 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -292,15 +292,15 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
         /*
          * Raw event type provide the config in the event structure
          */
-        if (perf_event_raw(attr)) {
-                hwc->config |= x86_pmu.raw_event(perf_event_config(attr));
+        if (attr->type == PERF_TYPE_RAW) {
+                hwc->config |= x86_pmu.raw_event(attr->config);
         } else {
-                if (perf_event_id(attr) >= x86_pmu.max_events)
+                if (attr->config >= x86_pmu.max_events)
                         return -EINVAL;
                 /*
                  * The generic map:
                  */
-                hwc->config |= x86_pmu.event_map(perf_event_id(attr));
+                hwc->config |= x86_pmu.event_map(attr->config);
         }
 
         counter->destroy = hw_perf_counter_destroy;