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

Commit 1508487e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

timers: fix itimer/many thread hang, fix



fix bogus rq dereference: v3 removed the locking but also removed the rq
initialization.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7086efe1
Loading
Loading
Loading
Loading
+5 −1
Original line number Original line Diff line number Diff line
@@ -4042,10 +4042,12 @@ EXPORT_PER_CPU_SYMBOL(kstat);
 */
 */
unsigned long long task_delta_exec(struct task_struct *p)
unsigned long long task_delta_exec(struct task_struct *p)
{
{
	struct rq *rq;
	unsigned long flags;
	unsigned long flags;
	struct rq *rq;
	u64 ns = 0;
	u64 ns = 0;


	rq = task_rq_lock(p, &flags);

	if (task_current(rq, p)) {
	if (task_current(rq, p)) {
		u64 delta_exec;
		u64 delta_exec;


@@ -4055,6 +4057,8 @@ unsigned long long task_delta_exec(struct task_struct *p)
			ns = delta_exec;
			ns = delta_exec;
	}
	}


	task_rq_unlock(rq, &flags);

	return ns;
	return ns;
}
}