diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 19:01:36 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 19:01:36 -0400 |
| commit | 516d5f8b04ce2bcd24f03323fc743ae25b81373d (patch) | |
| tree | ff37e84692dbef5063bbf22672eb8bfad0f25dd8 /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | 6ba694560caeb3531dbedd5b3a37af037ef2a833 (diff) | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
Merge tag 'v3.17-rc3' into next
Sync with mainline to bring in Chrome EC changes.
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
| -rwxr-xr-x | tools/perf/scripts/python/net_dropmonitor.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py index b5740599aabd..0b6ce8c253e8 100755 --- a/tools/perf/scripts/python/net_dropmonitor.py +++ b/tools/perf/scripts/python/net_dropmonitor.py | |||
| @@ -66,7 +66,7 @@ def trace_end(): | |||
| 66 | print_drop_table() | 66 | print_drop_table() |
| 67 | 67 | ||
| 68 | # called from perf, when it finds a correspoinding event | 68 | # called from perf, when it finds a correspoinding event |
| 69 | def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, | 69 | def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, callchain, |
| 70 | skbaddr, location, protocol): | 70 | skbaddr, location, protocol): |
| 71 | slocation = str(location) | 71 | slocation = str(location) |
| 72 | try: | 72 | try: |