diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-09-03 16:57:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-03 16:57:41 +0200 |
| commit | 05244d166739ae273fdc7a2151bdef61df49ca7d (patch) | |
| tree | 9065482d33f445c90f0b99d29aa51485d1d96488 /tools/perf/scripts/python/check-perf-trace.py | |
| parent | ALSA: hda - Fix COEF setups for ALC1150 codec (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/axi', 'asoc/fix/cs4265', 'asoc/fix/da732x', 'asoc/fix/omap', 'asoc/fix/rsnd', 'asoc/fix/rt5640', 'asoc/fix/rt5677', 'asoc/fix/simple' and 'asoc/fix/tegra' into asoc-linus (diff) | |
| download | linux-dev-05244d166739ae273fdc7a2151bdef61df49ca7d.tar.xz linux-dev-05244d166739ae273fdc7a2151bdef61df49ca7d.zip | |
Merge tag 'asoc-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
A few more driver specific fixes on top of the currently pending fixes
(which are already in your tree but not Linus').
Diffstat (limited to 'tools/perf/scripts/python/check-perf-trace.py')
| -rw-r--r-- | tools/perf/scripts/python/check-perf-trace.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/scripts/python/check-perf-trace.py b/tools/perf/scripts/python/check-perf-trace.py index 4647a7694cf6..334599c6032c 100644 --- a/tools/perf/scripts/python/check-perf-trace.py +++ b/tools/perf/scripts/python/check-perf-trace.py @@ -27,7 +27,7 @@ def trace_end(): def irq__softirq_entry(event_name, context, common_cpu, common_secs, common_nsecs, common_pid, common_comm, - vec): + common_callchain, vec): print_header(event_name, common_cpu, common_secs, common_nsecs, common_pid, common_comm) @@ -38,7 +38,7 @@ def irq__softirq_entry(event_name, context, common_cpu, def kmem__kmalloc(event_name, context, common_cpu, common_secs, common_nsecs, common_pid, common_comm, - call_site, ptr, bytes_req, bytes_alloc, + common_callchain, call_site, ptr, bytes_req, bytes_alloc, gfp_flags): print_header(event_name, common_cpu, common_secs, common_nsecs, common_pid, common_comm) |