These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / tools / perf / tests / mmap-basic.c

diff --git a/kernel/tools/perf/tests/mmap-basic.c b/kernel/tools/perf/tests/mmap-basic.c
index 9b9622a..4495493 100644 (file)
--- a/kernel/tools/perf/tests/mmap-basic.c
+++ b/kernel/tools/perf/tests/mmap-basic.c
@@ -3,6 +3,7 @@
 #include "thread_map.h"
 #include "cpumap.h"
 #include "tests.h"
+#include <linux/err.h>
 
 /*
  * This test will generate random numbers of calls to some getpid syscalls,
@@ -23,10 +24,8 @@ int test__basic_mmap(void)
        struct cpu_map *cpus;
        struct perf_evlist *evlist;
        cpu_set_t cpu_set;
-       const char *syscall_names[] = { "getsid", "getppid", "getpgrp",
-                                       "getpgid", };
-       pid_t (*syscalls[])(void) = { (void *)getsid, getppid, getpgrp,
-                                     (void*)getpgid };
+       const char *syscall_names[] = { "getsid", "getppid", "getpgid", };
+       pid_t (*syscalls[])(void) = { (void *)getsid, getppid, (void*)getpgid };
 #define nsyscalls ARRAY_SIZE(syscall_names)
        unsigned int nr_events[nsyscalls],
                     expected_nr_events[nsyscalls], i, j;
@@ -67,7 +66,7 @@ int test__basic_mmap(void)
 
                snprintf(name, sizeof(name), "sys_enter_%s", syscall_names[i]);
                evsels[i] = perf_evsel__newtp("syscalls", name);
-               if (evsels[i] == NULL) {
+               if (IS_ERR(evsels[i])) {
                        pr_debug("perf_evsel__new\n");
                        goto out_delete_evlist;
                }
@@ -142,8 +141,8 @@ out_delete_evlist:
        cpus    = NULL;
        threads = NULL;
 out_free_cpus:
-       cpu_map__delete(cpus);
+       cpu_map__put(cpus);
 out_free_threads:
-       thread_map__delete(threads);
+       thread_map__put(threads);
        return err;
 }