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

Commit 1c9d6860 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched: fix circular dependency of rq->lock and kswadp waitqueue lock"

parents daaf67da 248e9c7b

kernel/sched/core.c

+2 −1
Original line number Diff line number Diff line
@@ -7452,9 +7452,10 @@ void init_idle(struct task_struct *idle, int cpu) 
	struct rq *rq = cpu_rq(cpu);

	unsigned long flags;



	__sched_fork(0, idle);



	raw_spin_lock_irqsave(&rq->lock, flags);



	__sched_fork(0, idle);

	idle->state = TASK_RUNNING;

	idle->se.exec_start = sched_clock();

kernel/sched/qhmp_core.c

+2 −1
Original line number Diff line number Diff line
@@ -6478,9 +6478,10 @@ void init_idle(struct task_struct *idle, int cpu) 
	struct rq *rq = cpu_rq(cpu);

	unsigned long flags;



	__sched_fork(0, idle);



	raw_spin_lock_irqsave(&rq->lock, flags);



	__sched_fork(0, idle);

	idle->state = TASK_RUNNING;

	idle->se.exec_start = sched_clock();