diff options
Diffstat (limited to 'tools/perf/builtin-top.c')
-rw-r--r-- | tools/perf/builtin-top.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 4002ccb36750..1ca88896eee4 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
@@ -901,7 +901,7 @@ struct mmap_data { | |||
901 | 901 | ||
902 | static unsigned int mmap_read_head(struct mmap_data *md) | 902 | static unsigned int mmap_read_head(struct mmap_data *md) |
903 | { | 903 | { |
904 | struct perf_counter_mmap_page *pc = md->base; | 904 | struct perf_event_mmap_page *pc = md->base; |
905 | int head; | 905 | int head; |
906 | 906 | ||
907 | head = pc->data_head; | 907 | head = pc->data_head; |
@@ -977,9 +977,9 @@ static void mmap_read_counter(struct mmap_data *md) | |||
977 | 977 | ||
978 | old += size; | 978 | old += size; |
979 | 979 | ||
980 | if (event->header.type == PERF_EVENT_SAMPLE) { | 980 | if (event->header.type == PERF_RECORD_SAMPLE) { |
981 | int user = | 981 | int user = |
982 | (event->header.misc & PERF_EVENT_MISC_CPUMODE_MASK) == PERF_EVENT_MISC_USER; | 982 | (event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK) == PERF_RECORD_MISC_USER; |
983 | process_event(event->ip.ip, md->counter, user); | 983 | process_event(event->ip.ip, md->counter, user); |
984 | } | 984 | } |
985 | } | 985 | } |
@@ -1005,7 +1005,7 @@ int group_fd; | |||
1005 | 1005 | ||
1006 | static void start_counter(int i, int counter) | 1006 | static void start_counter(int i, int counter) |
1007 | { | 1007 | { |
1008 | struct perf_counter_attr *attr; | 1008 | struct perf_event_attr *attr; |
1009 | int cpu; | 1009 | int cpu; |
1010 | 1010 | ||
1011 | cpu = profile_cpu; | 1011 | cpu = profile_cpu; |
@@ -1019,7 +1019,7 @@ static void start_counter(int i, int counter) | |||
1019 | attr->inherit = (cpu < 0) && inherit; | 1019 | attr->inherit = (cpu < 0) && inherit; |
1020 | 1020 | ||
1021 | try_again: | 1021 | try_again: |
1022 | fd[i][counter] = sys_perf_counter_open(attr, target_pid, cpu, group_fd, 0); | 1022 | fd[i][counter] = sys_perf_event_open(attr, target_pid, cpu, group_fd, 0); |
1023 | 1023 | ||
1024 | if (fd[i][counter] < 0) { | 1024 | if (fd[i][counter] < 0) { |
1025 | int err = errno; | 1025 | int err = errno; |
@@ -1044,7 +1044,7 @@ try_again: | |||
1044 | printf("\n"); | 1044 | printf("\n"); |
1045 | error("perfcounter syscall returned with %d (%s)\n", | 1045 | error("perfcounter syscall returned with %d (%s)\n", |
1046 | fd[i][counter], strerror(err)); | 1046 | fd[i][counter], strerror(err)); |
1047 | die("No CONFIG_PERF_COUNTERS=y kernel support configured?\n"); | 1047 | die("No CONFIG_PERF_EVENTS=y kernel support configured?\n"); |
1048 | exit(-1); | 1048 | exit(-1); |
1049 | } | 1049 | } |
1050 | assert(fd[i][counter] >= 0); | 1050 | assert(fd[i][counter] >= 0); |