diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 09:34:38 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 09:35:36 -0400 |
| commit | db985cbd67c45f875ef43cb5febfaa8cbd203c27 (patch) | |
| tree | 63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /tools/perf/scripts/python/Perf-Trace-Util/lib | |
| parent | c6f1224573c3b609bd8073b39f496637a16cc06f (diff) | |
| parent | 468a903c0e5147e3f93187f0b808a3ef957fd00e (diff) | |
Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.18
- renesas: suspend to RAM, runtime PM, cleanups and DT binding docs
- keystone: add new driver
- hip04: add Hisilicon HiP04 driver (without touching irq-gic.c)
- gic: Use defines instead of magic number, preserve v2 bybass bits
- handle_domain_irq: common low level interrupt entry handler
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util/lib')
| -rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 3 |
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): | |||
| 107 | 107 | ||
| 108 | class EventHeaders: | 108 | class EventHeaders: |
| 109 | def __init__(self, common_cpu, common_secs, common_nsecs, | 109 | def __init__(self, common_cpu, common_secs, common_nsecs, |
| 110 | common_pid, common_comm): | 110 | common_pid, common_comm, common_callchain): |
| 111 | self.cpu = common_cpu | 111 | self.cpu = common_cpu |
| 112 | self.secs = common_secs | 112 | self.secs = common_secs |
| 113 | self.nsecs = common_nsecs | 113 | self.nsecs = common_nsecs |
| 114 | self.pid = common_pid | 114 | self.pid = common_pid |
| 115 | self.comm = common_comm | 115 | self.comm = common_comm |
| 116 | self.callchain = common_callchain | ||
| 116 | 117 | ||
| 117 | def ts(self): | 118 | def ts(self): |
| 118 | return (self.secs * (10 ** 9)) + self.nsecs | 119 | return (self.secs * (10 ** 9)) + self.nsecs |
