Merge branch 'next' into for-linus

Prepare first round of input updates for 3.18.

1 files changed, 2 insertions, 1 deletions

diff --git a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
index de7211e4fa47..38dfb720fb6f 100644
--- a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
+++ b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
@@ -107,12 +107,13 @@ def taskState(state):
 
 class EventHeaders:
         def __init__(self, common_cpu, common_secs, common_nsecs,
-                     common_pid, common_comm):
+                     common_pid, common_comm, common_callchain):
                 self.cpu = common_cpu
                 self.secs = common_secs
                 self.nsecs = common_nsecs
                 self.pid = common_pid
                 self.comm = common_comm
+                self.callchain = common_callchain
 
         def ts(self):
                 return (self.secs * (10 ** 9)) + self.nsecs