Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Tidy up after the big rename
  perf: Do the big rename: Performance Counters -> Performance Events
  perf_counter: Rename 'event' to event_id/hw_event
  perf_counter: Rename list_entry -> group_entry, counter_list -> group_list

Manually resolved some fairly trivial conflicts with the tracing tree in
include/trace/ftrace.h and kernel/trace/trace_syscalls.c.

1 files changed, 7 insertions, 7 deletions

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 600406396274..4405681b3134 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -937,21 +937,21 @@ process_event(event_t *event)
 
         switch (event->header.type) {
 
-        case PERF_EVENT_COMM:
+        case PERF_RECORD_COMM:
                 return process_comm_event(event);
-        case PERF_EVENT_FORK:
+        case PERF_RECORD_FORK:
                 return process_fork_event(event);
-        case PERF_EVENT_EXIT:
+        case PERF_RECORD_EXIT:
                 return process_exit_event(event);
-        case PERF_EVENT_SAMPLE:
+        case PERF_RECORD_SAMPLE:
                 return queue_sample_event(event);
 
         /*
          * We dont process them right now but they are fine:
          */
-        case PERF_EVENT_MMAP:
-        case PERF_EVENT_THROTTLE:
-        case PERF_EVENT_UNTHROTTLE:
+        case PERF_RECORD_MMAP:
+        case PERF_RECORD_THROTTLE:
+        case PERF_RECORD_UNTHROTTLE:
                 return 0;
 
         default: