1 files changed, 18 insertions, 18 deletions

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index d5911b02bc8c..887df88a9c2a 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -42,15 +42,15 @@ enum perf_hw_id {
         /*
          * Common hardware events, generalized by the kernel:
          */
-        PERF_COUNT_CPU_CYCLES           = 0,
-        PERF_COUNT_INSTRUCTIONS         = 1,
-        PERF_COUNT_CACHE_REFERENCES     = 2,
-        PERF_COUNT_CACHE_MISSES         = 3,
-        PERF_COUNT_BRANCH_INSTRUCTIONS  = 4,
-        PERF_COUNT_BRANCH_MISSES        = 5,
-        PERF_COUNT_BUS_CYCLES           = 6,
-
-        PERF_HW_EVENTS_MAX,             /* non ABI */
+        PERF_COUNT_HW_CPU_CYCLES                = 0,
+        PERF_COUNT_HW_INSTRUCTIONS              = 1,
+        PERF_COUNT_HW_CACHE_REFERENCES          = 2,
+        PERF_COUNT_HW_CACHE_MISSES              = 3,
+        PERF_COUNT_HW_BRANCH_INSTRUCTIONS       = 4,
+        PERF_COUNT_HW_BRANCH_MISSES             = 5,
+        PERF_COUNT_HW_BUS_CYCLES                = 6,
+
+        PERF_COUNT_HW_MAX,              /* non ABI */
 };
 
 /*
@@ -93,15 +93,15 @@ enum perf_hw_cache_op_result_id {
  * well):
  */
 enum perf_sw_ids {
-        PERF_COUNT_CPU_CLOCK            = 0,
-        PERF_COUNT_TASK_CLOCK           = 1,
-        PERF_COUNT_PAGE_FAULTS          = 2,
-        PERF_COUNT_CONTEXT_SWITCHES     = 3,
-        PERF_COUNT_CPU_MIGRATIONS       = 4,
-        PERF_COUNT_PAGE_FAULTS_MIN      = 5,
-        PERF_COUNT_PAGE_FAULTS_MAJ      = 6,
-
-        PERF_SW_EVENTS_MAX,             /* non ABI */
+        PERF_COUNT_SW_CPU_CLOCK         = 0,
+        PERF_COUNT_SW_TASK_CLOCK        = 1,
+        PERF_COUNT_SW_PAGE_FAULTS       = 2,
+        PERF_COUNT_SW_CONTEXT_SWITCHES  = 3,
+        PERF_COUNT_SW_CPU_MIGRATIONS    = 4,
+        PERF_COUNT_SW_PAGE_FAULTS_MIN   = 5,
+        PERF_COUNT_SW_PAGE_FAULTS_MAJ   = 6,
+
+        PERF_COUNT_SW_MAX,              /* non ABI */
 };
 
 /*