perf_counter tools: Fix up the ABI shakeup

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
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>

1 files changed, 10 insertions, 10 deletions

diff --git a/Documentation/perf_counter/builtin-top.c b/Documentation/perf_counter/builtin-top.c
index a2cff7b05276..5029d8e6cd9c 100644
--- a/Documentation/perf_counter/builtin-top.c
+++ b/Documentation/perf_counter/builtin-top.c
@@ -537,7 +537,7 @@ static void mmap_read(struct mmap_data *md)
                 old += size;
 
                 if (event->header.misc & PERF_EVENT_MISC_OVERFLOW) {
-                        if (event->header.type & PERF_RECORD_IP)
+                        if (event->header.type & PERF_SAMPLE_IP)
                                 process_event(event->ip.ip, md->counter);
                 } else {
                         switch (event->header.type) {
@@ -563,7 +563,7 @@ static struct mmap_data mmap_array[MAX_NR_CPUS][MAX_COUNTERS];
 
 static int __cmd_top(void)
 {
-        struct perf_counter_hw_event hw_event;
+        struct perf_counter_attr attr;
         pthread_t thread;
         int i, counter, group_fd, nr_poll = 0;
         unsigned int cpu;
@@ -577,15 +577,15 @@ static int __cmd_top(void)
                         if (target_pid == -1 && profile_cpu == -1)
                                 cpu = i;
 
-                        memset(&hw_event, 0, sizeof(hw_event));
-                        hw_event.config         = event_id[counter];
-                        hw_event.irq_period     = event_count[counter];
-                        hw_event.record_type    = PERF_RECORD_IP | PERF_RECORD_TID;
-                        hw_event.mmap           = use_mmap;
-                        hw_event.munmap         = use_munmap;
-                        hw_event.freq           = freq;
+                        memset(&attr, 0, sizeof(attr));
+                        attr.config             = event_id[counter];
+                        attr.sample_period      = event_count[counter];
+                        attr.sample_type        = PERF_SAMPLE_IP | PERF_SAMPLE_TID;
+                        attr.mmap               = use_mmap;
+                        attr.munmap             = use_munmap;
+                        attr.freq               = freq;
 
-                        fd[i][counter] = sys_perf_counter_open(&hw_event, target_pid, cpu, group_fd, 0);
+                        fd[i][counter] = sys_perf_counter_open(&attr, target_pid, cpu, group_fd, 0);
                         if (fd[i][counter] < 0) {
                                 int err = errno;
                                 printf("kerneltop error: syscall returned with %d (%s)\n",