Skip to content

Commit 3a87498

Browse files
committed
Merge tag 'sched_urgent_for_v6.7_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Borislav Petkov: - Make sure tasks are thawed exactly and only once to avoid their state getting corrupted * tag 'sched_urgent_for_v6.7_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: freezer,sched: Do not restore saved_state of a thawed task
2 parents 537ccb5 + 23ab79e commit 3a87498

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/freezer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ void __thaw_task(struct task_struct *p)
201201
if (WARN_ON_ONCE(freezing(p)))
202202
goto unlock;
203203

204-
if (task_call_func(p, __restore_freezer_state, NULL))
204+
if (!frozen(p) || task_call_func(p, __restore_freezer_state, NULL))
205205
goto unlock;
206206

207207
wake_up_state(p, TASK_FROZEN);

0 commit comments

Comments
 (0)