Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Sat, 22 Feb 2014 16:20:46 +0000 (17:20 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 22 Feb 2014 16:20:46 +0000 (17:20 +0100)
commita9d3f94ec7708427b9f05a65246d3fd6e287fa51
treeef555c5c85e55d90c343af382b1042b2957c0584
parent337397f3afc911d94d1d71371a36a53ce218b41f
parent844ae5b46c08dbc7ba695b543c023f9cf3bbf9ff
Merge tag 'perf-urgent-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  * Handle PERF_RECORD_HEADER_EVENT_TYPE properly. (Jiri Olsa)

  * Fix checking for supported events on older kernels in
    'perf list' (Vince Weaver)

  * Do not add offset twice to uprobe address in
    'perf probe' (Masami Hiramatsu)

  * Fix perf trace's ioctl 'request' beautifier build problems
    on !(i386 || x86_64) arches (Arnaldo Carvalho de Melo)

  * Fix 'perf trace' build by adding a fallback definition for
    EFD_SEMAPHORE (Ben Hutchings)

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