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

Commit b9d40b7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus-2' of... 

Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf_events: Make ABI definitions available to userspace
  perf tools: elf_sym__is_function() should accept "zero" sized functions
  tracing/syscalls: Use long for syscall ret format and field definitions
  perf trace: Update eval_flag() flags array to match interrupt.h
  perf trace: Remove unused code in builtin-trace.c
  perf: Propagate term signal to child
parents 7c1632ba e13dbd7d

include/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ header-y += nfs_mount.h 
header-y += nl80211.h

header-y += param.h

header-y += pci_regs.h

header-y += perf_event.h

header-y += pfkeyv2.h

header-y += pg.h

header-y += phantom.h

kernel/trace/trace_syscalls.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int syscall_exit_format(struct ftrace_event_call *call, struct trace_seq *s) 
			       "\tfield:%s %s;\toffset:%zu;\tsize:%zu;\n"

			       "\tfield:%s %s;\toffset:%zu;\tsize:%zu;\n",

			       SYSCALL_FIELD(int, nr),

			       SYSCALL_FIELD(unsigned long, ret));

			       SYSCALL_FIELD(long, ret));

	if (!ret)

		return 0;
@@ -212,7 +212,7 @@ int syscall_exit_define_fields(struct ftrace_event_call *call) 
	if (ret)

		return ret;



	ret = trace_define_field(call, SYSCALL_FIELD(unsigned long, ret), 0,

	ret = trace_define_field(call, SYSCALL_FIELD(long, ret), 0,

				 FILTER_OTHER);



	return ret;

tools/perf/builtin-record.c

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static int raw_samples = 0; 
static int			system_wide			= 0;

static int			profile_cpu			= -1;

static pid_t			target_pid			= -1;

static pid_t			child_pid			= -1;

static int			inherit				= 1;

static int			force				= 0;

static int			append_file			= 0;
@@ -184,6 +185,9 @@ static void sig_handler(int sig) 


static void sig_atexit(void)

{

	if (child_pid != -1)

		kill(child_pid, SIGTERM);



	if (signr == -1)

		return;
@@ -610,6 +614,8 @@ static int __cmd_record(int argc, const char **argv) 
				exit(-1);

			}

		}



		child_pid = pid;

	}



	if (realtime_prio) {

tools/perf/builtin-stat.c

+7 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ static int run_idx = 0; 
static int			run_count			=  1;

static int			inherit				=  1;

static int			scale				=  1;

static int			target_pid			= -1;

static pid_t			target_pid			= -1;

static pid_t			child_pid			= -1;

static int			null_run			=  0;



static int			fd[MAX_NR_CPUS][MAX_COUNTERS];
@@ -285,6 +286,8 @@ static int run_perf_stat(int argc __used, const char **argv) 
		exit(-1);

	}



	child_pid = pid;



	/*

	 * Wait for the child to be ready to exec.

	 */
@@ -433,6 +436,9 @@ static void skip_signal(int signo) 


static void sig_atexit(void)

{

	if (child_pid != -1)

		kill(child_pid, SIGTERM);



	if (signr == -1)

		return;

tools/perf/builtin-trace.c

+0 −6
Original line number Diff line number Diff line
@@ -219,10 +219,6 @@ static int __cmd_trace(void) 
more:

	event = (event_t *)(buf + head);



	size = event->header.size;

	if (!size)

		size = 8;



	if (head + event->header.size >= page_size * mmap_window) {

		unsigned long shift = page_size * (head / page_size);

		int res;
@@ -237,7 +233,6 @@ static int __cmd_trace(void) 


	size = event->header.size;





	if (!size || process_event(event, offset, head) < 0) {



		/*
@@ -290,7 +285,6 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used) 
			usage_with_options(annotate_usage, options);

	}





	setup_pager();



	return __cmd_trace();