perf_counter: Rename perf_counter_hw_event => perf_counter_attr

The structure isn't hw only and when I read event, I think about those
things that fall out the other end. Rename the thing.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Kacur <jkacur@redhat.com>
Cc: Stephane Eranian <eranian@googlemail.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 27 insertions, 27 deletions

diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c
index c9633321e7a5..ea54686cb787 100644
--- a/arch/powerpc/kernel/perf_counter.c
+++ b/arch/powerpc/kernel/perf_counter.c
@@ -262,13 +262,13 @@ static int check_excludes(struct perf_counter **ctrs, unsigned int cflags[],
                 }
                 counter = ctrs[i];
                 if (first) {
-                        eu = counter->hw_event.exclude_user;
-                        ek = counter->hw_event.exclude_kernel;
-                        eh = counter->hw_event.exclude_hv;
+                        eu = counter->attr.exclude_user;
+                        ek = counter->attr.exclude_kernel;
+                        eh = counter->attr.exclude_hv;
                         first = 0;
-                } else if (counter->hw_event.exclude_user != eu ||
-                           counter->hw_event.exclude_kernel != ek ||
-                           counter->hw_event.exclude_hv != eh) {
+                } else if (counter->attr.exclude_user != eu ||
+                           counter->attr.exclude_kernel != ek ||
+                           counter->attr.exclude_hv != eh) {
                         return -EAGAIN;
                 }
         }
@@ -483,16 +483,16 @@ void hw_perf_enable(void)
 
         /*
          * Add in MMCR0 freeze bits corresponding to the
-         * hw_event.exclude_* bits for the first counter.
+         * attr.exclude_* bits for the first counter.
          * We have already checked that all counters have the
          * same values for these bits as the first counter.
          */
         counter = cpuhw->counter[0];
-        if (counter->hw_event.exclude_user)
+        if (counter->attr.exclude_user)
                 cpuhw->mmcr[0] |= MMCR0_FCP;
-        if (counter->hw_event.exclude_kernel)
+        if (counter->attr.exclude_kernel)
                 cpuhw->mmcr[0] |= freeze_counters_kernel;
-        if (counter->hw_event.exclude_hv)
+        if (counter->attr.exclude_hv)
                 cpuhw->mmcr[0] |= MMCR0_FCHV;
 
         /*
@@ -786,10 +786,10 @@ static int can_go_on_limited_pmc(struct perf_counter *counter, u64 ev,
         int n;
         u64 alt[MAX_EVENT_ALTERNATIVES];
 
-        if (counter->hw_event.exclude_user
-            || counter->hw_event.exclude_kernel
-            || counter->hw_event.exclude_hv
-            || counter->hw_event.sample_period)
+        if (counter->attr.exclude_user
+            || counter->attr.exclude_kernel
+            || counter->attr.exclude_hv
+            || counter->attr.sample_period)
                 return 0;
 
         if (ppmu->limited_pmc_event(ev))
@@ -855,13 +855,13 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter)
 
         if (!ppmu)
                 return ERR_PTR(-ENXIO);
-        if (!perf_event_raw(&counter->hw_event)) {
-                ev = perf_event_id(&counter->hw_event);
+        if (!perf_event_raw(&counter->attr)) {
+                ev = perf_event_id(&counter->attr);
                 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->hw_event);
+                ev = perf_event_config(&counter->attr);
         }
         counter->hw.config_base = ev;
         counter->hw.idx = 0;
@@ -872,7 +872,7 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter)
          * the user set it to.
          */
         if (!firmware_has_feature(FW_FEATURE_LPAR))
-                counter->hw_event.exclude_hv = 0;
+                counter->attr.exclude_hv = 0;
 
         /*
          * If this is a per-task counter, then we can use
@@ -990,7 +990,7 @@ static void record_and_restart(struct perf_counter *counter, long val,
          */
         if (record) {
                 addr = 0;
-                if (counter->hw_event.record_type & PERF_RECORD_ADDR) {
+                if (counter->attr.record_type & PERF_RECORD_ADDR) {
                         /*
                          * The user wants a data address recorded.
                          * If we're not doing instruction sampling,
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 904571bea710..e16e8c13132f 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -247,11 +247,11 @@ static inline int x86_pmu_initialized(void)
 }
 
 /*
- * Setup the hardware configuration for a given hw_event_type
+ * Setup the hardware configuration for a given attr_type
  */
 static int __hw_perf_counter_init(struct perf_counter *counter)
 {
-        struct perf_counter_hw_event *hw_event = &counter->hw_event;
+        struct perf_counter_attr *attr = &counter->attr;
         struct hw_perf_counter *hwc = &counter->hw;
         int err;
 
@@ -279,9 +279,9 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
         /*
          * Count user and OS events unless requested not to.
          */
-        if (!hw_event->exclude_user)
+        if (!attr->exclude_user)
                 hwc->config |= ARCH_PERFMON_EVENTSEL_USR;
-        if (!hw_event->exclude_kernel)
+        if (!attr->exclude_kernel)
                 hwc->config |= ARCH_PERFMON_EVENTSEL_OS;
 
         if (!hwc->sample_period)
@@ -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(hw_event)) {
-                hwc->config |= x86_pmu.raw_event(perf_event_config(hw_event));
+        if (perf_event_raw(attr)) {
+                hwc->config |= x86_pmu.raw_event(perf_event_config(attr));
         } else {
-                if (perf_event_id(hw_event) >= x86_pmu.max_events)
+                if (perf_event_id(attr) >= x86_pmu.max_events)
                         return -EINVAL;
                 /*
                  * The generic map:
                  */
-                hwc->config |= x86_pmu.event_map(perf_event_id(hw_event));
+                hwc->config |= x86_pmu.event_map(perf_event_id(attr));
         }
 
         counter->destroy = hw_perf_counter_destroy;