Commit 4099a717 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched-urgent-2024-12-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fix from Ingo Molnar:
 "Fix a procfs task state reporting regression when freezing sleeping
  tasks"

* tag 'sched-urgent-2024-12-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  freezer, sched: Report frozen tasks as 'D' instead of 'R'
parents 6cbc4b29 f718faf3

include/linux/sched.h

+2 −1
Original line number Diff line number Diff line
@@ -1637,8 +1637,9 @@ static inline unsigned int __task_state_index(unsigned int tsk_state, 
	 * We're lying here, but rather than expose a completely new task state

	 * to userspace, we can make this appear as if the task has gone through

	 * a regular rt_mutex_lock() call.

	 * Report frozen tasks as uninterruptible.

	 */

	if (tsk_state & TASK_RTLOCK_WAIT)

	if ((tsk_state & TASK_RTLOCK_WAIT) || (tsk_state & TASK_FROZEN))

		state = TASK_UNINTERRUPTIBLE;



	return fls(state);