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

Commit efc96737 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/core' of... 

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
parents 1ec454ba 7e9a49ef

Documentation/trace/events.txt

+0 −2
Original line number Diff line number Diff line
@@ -191,8 +191,6 @@ And for string fields they are: 


Currently, only exact string matches are supported.



Currently, the maximum number of predicates in a filter is 16.



5.2 Setting filters

-------------------

include/linux/ftrace_event.h

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ enum { 
	TRACE_EVENT_FL_FILTERED_BIT,

	TRACE_EVENT_FL_RECORDED_CMD_BIT,

	TRACE_EVENT_FL_CAP_ANY_BIT,

	TRACE_EVENT_FL_NO_SET_FILTER_BIT,

};



enum {
@@ -179,6 +180,7 @@ enum { 
	TRACE_EVENT_FL_FILTERED		= (1 << TRACE_EVENT_FL_FILTERED_BIT),

	TRACE_EVENT_FL_RECORDED_CMD	= (1 << TRACE_EVENT_FL_RECORDED_CMD_BIT),

	TRACE_EVENT_FL_CAP_ANY		= (1 << TRACE_EVENT_FL_CAP_ANY_BIT),

	TRACE_EVENT_FL_NO_SET_FILTER	= (1 << TRACE_EVENT_FL_NO_SET_FILTER_BIT),

};



struct ftrace_event_call {

kernel/jump_label.c

+2 −1
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ void jump_label_inc(struct jump_label_key *key) 
		return;



	jump_label_lock();

	if (atomic_add_return(1, &key->enabled) == 1)

	if (atomic_read(&key->enabled) == 0)

		jump_label_update(key, JUMP_LABEL_ENABLE);

	atomic_inc(&key->enabled);

	jump_label_unlock();

}

kernel/lockdep.c

+13 −17
Original line number Diff line number Diff line
@@ -498,36 +498,32 @@ void get_usage_chars(struct lock_class *class, char usage[LOCK_USAGE_CHARS]) 
	usage[i] = '\0';

}



static int __print_lock_name(struct lock_class *class)

static void __print_lock_name(struct lock_class *class)

{

	char str[KSYM_NAME_LEN];

	const char *name;



	name = class->name;

	if (!name)

		name = __get_key_name(class->key, str);



	return printk("%s", name);

}



static void print_lock_name(struct lock_class *class)

{

	char str[KSYM_NAME_LEN], usage[LOCK_USAGE_CHARS];

	const char *name;



	get_usage_chars(class, usage);



	name = class->name;

	if (!name) {

		name = __get_key_name(class->key, str);

		printk(" (%s", name);

		printk("%s", name);

	} else {

		printk(" (%s", name);

		printk("%s", name);

		if (class->name_version > 1)

			printk("#%d", class->name_version);

		if (class->subclass)

			printk("/%d", class->subclass);

	}

}



static void print_lock_name(struct lock_class *class)

{

	char usage[LOCK_USAGE_CHARS];



	get_usage_chars(class, usage);



	printk(" (");

	__print_lock_name(class);

	printk("){%s}", usage);

}

kernel/trace/ftrace.c

+3 −2
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ void clear_ftrace_function(void) 
	ftrace_pid_function = ftrace_stub;

}



#undef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST

#ifndef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST

/*

 * For those archs that do not test ftrace_trace_stop in their
@@ -1212,7 +1211,9 @@ ftrace_hash_move(struct ftrace_ops *ops, int enable, 
	if (!src->count) {

		free_ftrace_hash_rcu(*dst);

		rcu_assign_pointer(*dst, EMPTY_HASH);

		return 0;

		/* still need to update the function records */

		ret = 0;

		goto out;

	}



	/*