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

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

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

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

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ftrace: do_each_pid_task() needs rcu lock
parents 9dfea1b4 229c4ef8

kernel/trace/ftrace.c

+5 −0
Original line number Diff line number Diff line
@@ -1737,9 +1737,12 @@ static void clear_ftrace_pid(struct pid *pid) 
{

	struct task_struct *p;



	rcu_read_lock();

	do_each_pid_task(pid, PIDTYPE_PID, p) {

		clear_tsk_trace_trace(p);

	} while_each_pid_task(pid, PIDTYPE_PID, p);

	rcu_read_unlock();



	put_pid(pid);

}
@@ -1747,9 +1750,11 @@ static void set_ftrace_pid(struct pid *pid) 
{

	struct task_struct *p;



	rcu_read_lock();

	do_each_pid_task(pid, PIDTYPE_PID, p) {

		set_tsk_trace_trace(p);

	} while_each_pid_task(pid, PIDTYPE_PID, p);

	rcu_read_unlock();

}



static void clear_ftrace_pid_task(struct pid **pid)