Merge tag ‘perf-urgent-for-mingo-5.1-20190502’ of git:// into perf/urgent [Linux 5.1]

Merge tag ‘perf-urgent-for-mingo-5.1-20190502’ of git:// into perf/urgent [Linux 5.1]

This Linux kernel change "Merge tag ‘perf-urgent-for-mingo-5.1-20190502’ of git:// into perf/urgent" is included in the Linux 5.1 release. This change is authored by Ingo Molnar <mingo [at]> on Fri May 3 07:48:18 2019 +0200. The commit for this change in Linux stable tree is 221856b (patch). Other info about this change: Merge: 1804569 7e221b8

Merge tag 'perf-urgent-for-mingo-5.1-20190502' of git:// into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

tools UAPI:

  Arnaldo Carvalho de Melo:

  - Sync x86's vmx.h with the kernel.

  - Copy missing unistd.h headers for arc, hexagon and riscv, fixing
    a reported build regression on the ARC 32-bit architecture.

perf bench numa:

  Arnaldo Carvalho de Melo:

  - Add define for RUSAGE_THREAD if not present, fixing the build on the
    ARC architecture when only zlib and libnuma are present.

perf BPF:

  Arnaldo Carvalho de Melo:

  - The disassembler-four-args feature test needs -ldl on distros such as
    Mageia 7.

  Bo YU:

  - Fix unlocking on success in perf_env__find_btf(), detected with
    the coverity tool.


  Leo Yan:

  - Change misleading hard coded 'trace-cmd' string in error messages.

ARM hardware tracing:

  Leo Yan:

  - Always allocate memory for cs_etm_queue::prev_packet, fixing a segfault
    when processing CoreSight perf data.

perf annotate:

  Thadeu Lima de Souza Cascardo:

  - Fix build on 32 bit for BPF.

perf report:

  Thomas Richter:

  - Report OOM in status line in the GTK UI.

core libs:

  - Remove needless asm/unistd.h that, used with sys/syscall.h ended
    up redefining the syscalls defines in environments such as the
    ARC arch when using uClibc.

Signed-off-by: Arnaldo Carvalho de Melo <>
Signed-off-by: Ingo Molnar <>

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 tools/perf/util/cloexec.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c
index ca0fff6..06f4831 100644
--- a/tools/perf/util/cloexec.c
+++ b/tools/perf/util/cloexec.c
@@ -7,7 +7,6 @@
 #include "asm/bug.h"
 #include "debug.h"
 #include <unistd.h>
-#include <asm/unistd.h>
 #include <sys/syscall.h>

 static unsigned long flag = PERF_FLAG_FD_CLOEXEC;

Leave a Reply

Your email address will not be published. Required fields are marked *