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

Commit 9d6e323c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf kmem: Fix statistics typo
  kprobes: Fix distinct type warning
  perf: Rename perf_event_hw_event in design document
  perf tools: Add missing header files to LIB_H Makefile variable
  perf record: We should fork only if a program was specified to run
  perf diff: Fix usage array, it must end with a NULL entry
parents b21c0704 4efb5290

kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ int __kprobes register_kretprobe(struct kretprobe *rp) 
	/* Pre-allocate memory for max kretprobe instances */

	if (rp->maxactive <= 0) {

#ifdef CONFIG_PREEMPT

		rp->maxactive = max(10, 2 * num_possible_cpus());

		rp->maxactive = max_t(unsigned int, 10, 2*num_possible_cpus());

#else

		rp->maxactive = num_possible_cpus();

#endif

tools/perf/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -343,13 +343,18 @@ LIB_H += util/include/linux/string.h 
LIB_H += util/include/linux/types.h

LIB_H += util/include/asm/asm-offsets.h

LIB_H += util/include/asm/bitops.h

LIB_H += util/include/asm/bug.h

LIB_H += util/include/asm/byteorder.h

LIB_H += util/include/asm/swab.h

LIB_H += util/include/asm/system.h

LIB_H += util/include/asm/uaccess.h

LIB_H += perf.h

LIB_H += util/cache.h

LIB_H += util/callchain.h

LIB_H += util/debug.h

LIB_H += util/debugfs.h

LIB_H += util/event.h

LIB_H += util/exec_cmd.h

LIB_H += util/types.h

LIB_H += util/levenshtein.h

LIB_H += util/parse-options.h
@@ -362,6 +367,7 @@ LIB_H += util/session.h 
LIB_H += util/strbuf.h

LIB_H += util/string.h

LIB_H += util/strlist.h

LIB_H += util/svghelper.h

LIB_H += util/run-command.h

LIB_H += util/sigchain.h

LIB_H += util/symbol.h
@@ -370,6 +376,8 @@ LIB_H += util/values.h 
LIB_H += util/sort.h

LIB_H += util/hist.h

LIB_H += util/thread.h

LIB_H += util/trace-event.h

LIB_H += util/trace-event-perl.h

LIB_H += util/probe-finder.h

LIB_H += util/probe-event.h

tools/perf/builtin-diff.c

+2 −1
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ out_delete: 


static const char * const diff_usage[] = {

	"perf diff [<options>] [old_file] [new_file]",

	NULL,

};



static const struct option options[] = {

tools/perf/builtin-kmem.c

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void insert_alloc_stat(unsigned long call_site, unsigned long ptr, 
	if (data && data->ptr == ptr) {

		data->hit++;

		data->bytes_req += bytes_req;

		data->bytes_alloc += bytes_req;

		data->bytes_alloc += bytes_alloc;

	} else {

		data = malloc(sizeof(*data));

		if (!data)
@@ -177,7 +177,7 @@ static void insert_caller_stat(unsigned long call_site, 
	if (data && data->call_site == call_site) {

		data->hit++;

		data->bytes_req += bytes_req;

		data->bytes_alloc += bytes_req;

		data->bytes_alloc += bytes_alloc;

	} else {

		data = malloc(sizeof(*data));

		if (!data)

tools/perf/builtin-record.c

+8 −6
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static void atexit_header(void) 
	perf_header__write(&session->header, output, true);

}



static int __cmd_record(int argc __used, const char **argv)

static int __cmd_record(int argc, const char **argv)

{

	int i, counter;

	struct stat st;
@@ -411,6 +411,7 @@ static int __cmd_record(int argc __used, const char **argv) 
	int err;

	unsigned long waking = 0;

	int child_ready_pipe[2], go_pipe[2];

	const bool forks = target_pid == -1 && argc > 0;

	char buf;



	page_size = sysconf(_SC_PAGE_SIZE);
@@ -422,7 +423,7 @@ static int __cmd_record(int argc __used, const char **argv) 
	signal(SIGCHLD, sig_handler);

	signal(SIGINT, sig_handler);



	if (pipe(child_ready_pipe) < 0 || pipe(go_pipe) < 0) {

	if (forks && (pipe(child_ready_pipe) < 0 || pipe(go_pipe) < 0)) {

		perror("failed to create pipes");

		exit(-1);

	}
@@ -483,7 +484,7 @@ static int __cmd_record(int argc __used, const char **argv) 


	atexit(atexit_header);



	if (target_pid == -1) {

	if (forks) {

		pid = fork();

		if (pid < 0) {

			perror("failed to fork");
@@ -550,7 +551,7 @@ static int __cmd_record(int argc __used, const char **argv) 
			return err;

	}



	if (!system_wide)

	if (!system_wide && profile_cpu == -1)

		event__synthesize_thread(pid, process_synthesized_event,

					 session);

	else
@@ -569,6 +570,7 @@ static int __cmd_record(int argc __used, const char **argv) 
	/*

	 * Let the child rip

	 */

	if (forks)

		close(go_pipe[1]);



	for (;;) {
@@ -667,7 +669,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used) 


	argc = parse_options(argc, argv, options, record_usage,

			    PARSE_OPT_STOP_AT_NON_OPTION);

	if (!argc && target_pid == -1 && (!system_wide || profile_cpu == -1))

	if (!argc && target_pid == -1 && !system_wide && profile_cpu == -1)

		usage_with_options(record_usage, options);



	symbol__init();