Merge branch 'perf/urgent' into perf/core, to pick up fixes

[uclinux-h8/linux.git] / tools / perf / builtin-trace.c

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index b36061c..3518d35 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -3865,7 +3865,8 @@ int cmd_trace(int argc, const char **argv)
                                goto init_augmented_syscall_tp;
                        }
 
-                       if (strcmp(perf_evsel__name(evsel), "raw_syscalls:sys_enter") == 0) {
+                       if (trace.syscalls.events.augmented->priv == NULL &&
+                           strstr(perf_evsel__name(evsel), "syscalls:sys_enter")) {
                                struct perf_evsel *augmented = trace.syscalls.events.augmented;
                                if (perf_evsel__init_augmented_syscall_tp(augmented, evsel) ||
                                    perf_evsel__init_augmented_syscall_tp_args(augmented))