diff options
| author | Dave Airlie <[email protected]> | 2018-07-30 10:39:22 +1000 | 
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2018-07-30 10:39:22 +1000 | 
| commit | 3fce4618279373efc59a91adb16c11da46cd69e5 (patch) | |
| tree | 086fad6c9f260a0bcc9b6a3532c6cddc387dd907 /tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py | |
| parent | ecd7963f7cf967009882fd56eaee1e87a229bea2 (diff) | |
| parent | acb1872577b346bd15ab3a3f8dff780d6cca4b70 (diff) | |
BackMerge v4.18-rc7 into drm-next
rmk requested this for armada and I think we've had a few
conflicts build up.
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py')
| -rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py index f6c84966e4f8..7384dcb628c4 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py +++ b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py @@ -5,6 +5,7 @@  # This software may be distributed under the terms of the GNU General  # Public License ("GPL") version 2 as published by the Free Software  # Foundation. +from __future__ import print_function  import errno, os @@ -33,7 +34,7 @@ def nsecs_str(nsecs):      return str  def add_stats(dict, key, value): -	if not dict.has_key(key): +	if key not in dict:  		dict[key] = (value, value, value, 1)  	else:  		min, max, avg, count = dict[key] @@ -72,10 +73,10 @@ try:  except:  	if not audit_package_warned:  		audit_package_warned = True -		print "Install the audit-libs-python package to get syscall names.\n" \ -                    "For example:\n  # apt-get install python-audit (Ubuntu)" \ -                    "\n  # yum install audit-libs-python (Fedora)" \ -                    "\n  etc.\n" +		print("Install the audit-libs-python package to get syscall names.\n" +                    "For example:\n  # apt-get install python-audit (Ubuntu)" +                    "\n  # yum install audit-libs-python (Fedora)" +                    "\n  etc.\n")  def syscall_name(id):  	try:  |