Merge tag 'mmc-v4.14-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[linux-2.6-microblaze.git] / tools / perf / builtin-stat.c

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 866da7a..69523ed 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -707,7 +707,7 @@ try_again:
                                process_interval();
                        }
                }
-               wait(&status);
+               waitpid(child_pid, &status, 0);
 
                if (workload_exec_errno) {
                        const char *emsg = str_error_r(workload_exec_errno, msg, sizeof(msg));
@@ -1257,7 +1257,7 @@ static bool collect_data(struct perf_evsel *counter,
        if (counter->merged_stat)
                return false;
        cb(counter, data, true);
-       if (!no_merge)
+       if (!no_merge && counter->auto_merge_stats)
                collect_all_aliases(counter, cb, data);
        return true;
 }