Merge tag 'perf-core-for-mingo-5.1-20190225' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

perf annotate:

  Wei Li:

  - Fix getting source line failure

perf script:

  Andi Kleen:

  - Handle missing fields with -F +...

perf data:

  Jiri Olsa:

  - Prep work to support per-cpu files in a directory.

Intel PT:

  Adrian Hunter:

  - Improve thread_stack__no_call_return()

  - Hide x86 retpolines in thread stacks.

  - exported SQL viewer refactorings, new 'top calls' report..

  Alexander Shishkin:

  - Copy parent's address filter offsets on clone

  - Fix address filters for vmas with non-zero offset. Applies to
    ARM's CoreSight as well.

python scripts:

  Tony Jones:

  - Python3 support for several 'perf script' python scripts.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py
index a150164b44a3..212557a02c50 100755
--- a/tools/perf/scripts/python/net_dropmonitor.py
+++ b/tools/perf/scripts/python/net_dropmonitor.py
@@ -1,6 +1,8 @@
 # Monitor the system for dropped packets and proudce a report of drop locations and counts
 # SPDX-License-Identifier: GPL-2.0
 
+from __future__ import print_function
+
 import os
 import sys
 
@@ -50,19 +52,19 @@ def get_sym(sloc):
                 return (None, 0)
 
 def print_drop_table():
-        print "%25s %25s %25s" % ("LOCATION", "OFFSET", "COUNT")
+        print("%25s %25s %25s" % ("LOCATION", "OFFSET", "COUNT"))
         for i in drop_log.keys():
                 (sym, off) = get_sym(i)
                 if sym == None:
                         sym = i
-                print "%25s %25s %25s" % (sym, off, drop_log[i])
+                print("%25s %25s %25s" % (sym, off, drop_log[i]))
 
 
 def trace_begin():
-        print "Starting trace (Ctrl-C to dump results)"
+        print("Starting trace (Ctrl-C to dump results)")
 
 def trace_end():
-        print "Gathering kallsyms data"
+        print("Gathering kallsyms data")
         get_kallsyms_table()
         print_drop_table()