Merge tag 'v3.17-rc3' into next

Sync with mainline to bring in Chrome EC changes.

1 files changed, 6 insertions, 1 deletions

diff --git a/tools/perf/scripts/python/failed-syscalls-by-pid.py b/tools/perf/scripts/python/failed-syscalls-by-pid.py
index 85805fac4116..cafeff3d74db 100644
--- a/tools/perf/scripts/python/failed-syscalls-by-pid.py
+++ b/tools/perf/scripts/python/failed-syscalls-by-pid.py
@@ -39,7 +39,7 @@ def trace_end():
 
 def raw_syscalls__sys_exit(event_name, context, common_cpu,
         common_secs, common_nsecs, common_pid, common_comm,
-        id, ret):
+        common_callchain, id, ret):
         if (for_comm and common_comm != for_comm) or \
            (for_pid  and common_pid  != for_pid ):
                 return
@@ -50,6 +50,11 @@ def raw_syscalls__sys_exit(event_name, context, common_cpu,
                 except TypeError:
                         syscalls[common_comm][common_pid][id][ret] = 1
 
+def syscalls__sys_exit(event_name, context, common_cpu,
+        common_secs, common_nsecs, common_pid, common_comm,
+        id, ret):
+        raw_syscalls__sys_exit(**locals())
+
 def print_error_totals():
     if for_comm is not None:
             print "\nsyscall errors for %s:\n\n" % (for_comm),