The following commit has been merged into the sched/core branch of tip: Commit-ID: 600642ae9050a872055119ba09d0decc43f6c843 Gitweb: https://git.kernel.org/tip/600642ae9050a872055119ba09d0decc43f6c843 Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Fri, 11 Jun 2021 10:28:15 +02:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Fri, 18 Jun 2021 11:43:08 +02:00 sched,timer: Use __set_current_state() There's an existing helper for setting TASK_RUNNING; must've gotten lost last time we did this cleanup. Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Reviewed-by: Davidlohr Bueso <dbueso@xxxxxxx> Acked-by: Will Deacon <will@xxxxxxxxxx> Link: https://lore.kernel.org/r/20210611082838.409696194@xxxxxxxxxxxxx --- kernel/time/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index d111adf..467087d 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1879,7 +1879,7 @@ signed long __sched schedule_timeout(signed long timeout) printk(KERN_ERR "schedule_timeout: wrong timeout " "value %lx\n", timeout); dump_stack(); - current->state = TASK_RUNNING; + __set_current_state(TASK_RUNNING); goto out; } }
|