Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24e31f0b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 * Check for SIGINT in more loops, allowing tools such as 'perf report' to
   react faster to Ctrl+C, from Arnaldo Carvalho de Melo.

 * Fix objdump line parsing offset validation in the annotate code,
   from Adrian Hunter.

 * Fix buildid cache handling of kallsyms with kcore, from Adrian Hunter.

 * Fix compile with libelf without get_phdrnum, from Adrian Hunter.

 * Sharpen the libaudit dependencies test, refusing to build with older
   libraries that doesn't have all the functions used by 'perf trace", fix
   from Ingo Molnar.

 * Fill in new definitions for madvise()/mmap() flags to fix the build in
   older systems, from Ingo Molnar.

 * Fix old GCC build error in older systems in the kallsyms parsing code in
   trace-event-parse.c, from Ingo Molnar.

 * Ignore DWARF declaration tags, allowing, for instance, that the

     $ perf probe -L getname

   command succeeds in showing the source code for the 'getname' kernel
   function, telling in which lines probes can be inserted, fix from
   Masami Hiramatsu.

 * Fix linux/magic.h related build breakage in some systems, fix from
   Vinson Lee.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 186844b2 ce7eebe5

tools/lib/lk/debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <stdbool.h>

#include <sys/vfs.h>

#include <sys/mount.h>

#include <linux/magic.h>

#include <linux/kernel.h>



#include "debugfs.h"

tools/perf/builtin-inject.c

+0 −2
Original line number Diff line number Diff line
@@ -321,8 +321,6 @@ static int perf_inject__sched_stat(struct perf_tool *tool, 
	return perf_event__repipe(tool, event_sw, &sample_sw, machine);

}



extern volatile int session_done;



static void sig_handler(int sig __maybe_unused)

{

	session_done = 1;

tools/perf/builtin-report.c

+3 −2
Original line number Diff line number Diff line
@@ -401,8 +401,6 @@ static int perf_report__setup_sample_type(struct perf_report *rep) 
	return 0;

}



extern volatile int session_done;



static void sig_handler(int sig __maybe_unused)

{

	session_done = 1;
@@ -568,6 +566,9 @@ static int __cmd_report(struct perf_report *rep) 
		}

	}



	if (session_done())

		return 0;



	if (nr_samples == 0) {

		ui__error("The %s file has no samples!\n", session->filename);

		return 0;

tools/perf/builtin-script.c

+0 −2
Original line number Diff line number Diff line
@@ -553,8 +553,6 @@ static struct perf_tool perf_script = { 
	.ordering_requires_timestamps = true,

};



extern volatile int session_done;



static void sig_handler(int sig __maybe_unused)

{

	session_done = 1;

tools/perf/builtin-trace.c

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,23 @@ 
#include <sys/mman.h>

#include <linux/futex.h>



/* For older distros: */

#ifndef MAP_STACK

# define MAP_STACK		0x20000

#endif



#ifndef MADV_HWPOISON

# define MADV_HWPOISON		100

#endif



#ifndef MADV_MERGEABLE

# define MADV_MERGEABLE		12

#endif



#ifndef MADV_UNMERGEABLE

# define MADV_UNMERGEABLE	13

#endif



static size_t syscall_arg__scnprintf_hex(char *bf, size_t size,

					 unsigned long arg,

					 u8 arg_idx __maybe_unused,