Commit 0b34083f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/urgent-2' of... 

Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

 into perf/urgent

Pull tracing fixes from Steven Rostedt.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents aea8b5d1 740466bc

kernel/trace/ftrace.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3104,8 +3104,8 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, 
					continue;

					continue;

			}

			}





			hlist_del(&entry->node);

			hlist_del_rcu(&entry->node);

			call_rcu(&entry->rcu, ftrace_free_entry_rcu);

			call_rcu_sched(&entry->rcu, ftrace_free_entry_rcu);

		}

		}

	}

	}

	__disable_ftrace_function_probe();

	__disable_ftrace_function_probe();

kernel/trace/trace.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -704,7 +704,7 @@ __update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu) 
void

void

update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)

update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu)

{

{

	struct ring_buffer *buf = tr->buffer;

	struct ring_buffer *buf;





	if (trace_stop_count)

	if (trace_stop_count)

		return;

		return;
@@ -719,6 +719,7 @@ update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu) 




	arch_spin_lock(&ftrace_max_lock);

	arch_spin_lock(&ftrace_max_lock);





	buf = tr->buffer;

	tr->buffer = max_tr.buffer;

	tr->buffer = max_tr.buffer;

	max_tr.buffer = buf;

	max_tr.buffer = buf;