diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
| commit | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (patch) | |
| tree | a9e7f0563cef296b24c53b20dbb388ec5c210172 /tools/perf/scripts/python/check-perf-trace.py | |
| parent | 1c14e6cecb1811543b1016f27e5d308fbea8c08a (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/serial_sci.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'tools/perf/scripts/python/check-perf-trace.py')
| -rw-r--r-- | tools/perf/scripts/python/check-perf-trace.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/scripts/python/check-perf-trace.py b/tools/perf/scripts/python/check-perf-trace.py index 964d934395ff..d9f7893e315c 100644 --- a/tools/perf/scripts/python/check-perf-trace.py +++ b/tools/perf/scripts/python/check-perf-trace.py | |||
| @@ -51,8 +51,7 @@ def kmem__kmalloc(event_name, context, common_cpu, | |||
| 51 | 51 | ||
| 52 | flag_str("kmem__kmalloc", "gfp_flags", gfp_flags)), | 52 | flag_str("kmem__kmalloc", "gfp_flags", gfp_flags)), |
| 53 | 53 | ||
| 54 | def trace_unhandled(event_name, context, common_cpu, common_secs, common_nsecs, | 54 | def trace_unhandled(event_name, context, event_fields_dict): |
| 55 | common_pid, common_comm): | ||
| 56 | try: | 55 | try: |
| 57 | unhandled[event_name] += 1 | 56 | unhandled[event_name] += 1 |
| 58 | except TypeError: | 57 | except TypeError: |