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/syscall-counts.py b/tools/perf/scripts/python/syscall-counts.py
index b435d3f188e8..e66a7730aeb5 100644
--- a/tools/perf/scripts/python/syscall-counts.py
+++ b/tools/perf/scripts/python/syscall-counts.py
@@ -35,7 +35,7 @@ def trace_end():
 
 def raw_syscalls__sys_enter(event_name, context, common_cpu,
         common_secs, common_nsecs, common_pid, common_comm,
-        id, args):
+        common_callchain, id, args):
         if for_comm is not None:
                 if common_comm != for_comm:
                         return
@@ -44,6 +44,11 @@ def raw_syscalls__sys_enter(event_name, context, common_cpu,
         except TypeError:
                 syscalls[id] = 1
 
+def syscalls__sys_enter(event_name, context, common_cpu,
+        common_secs, common_nsecs, common_pid, common_comm,
+        id, args):
+        raw_syscalls__sys_enter(**locals())
+
 def print_syscall_totals():
     if for_comm is not None:
             print "\nsyscall events for %s:\n\n" % (for_comm),