diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-12-23 15:52:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-12-23 15:52:13 +0100 |
| commit | d2e9f53ac5dd76dadc0b5f04f6c27640604ce2af (patch) | |
| tree | bf82d9fbfdc2ce67630fdacc18c2231f3d17876a /kernel/freezer.c | |
| parent | freezer,sched: Clean saved_state when restoring it during thaw (diff) | |
| parent | Linux 6.7-rc6 (diff) | |
| download | linux-d2e9f53ac5dd76dadc0b5f04f6c27640604ce2af.tar.xz linux-d2e9f53ac5dd76dadc0b5f04f6c27640604ce2af.zip | |
Merge tag 'v6.7-rc6' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/freezer.c')
| -rw-r--r-- | kernel/freezer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/freezer.c b/kernel/freezer.c index 43b1d1b94d9e..f57aaf96b829 100644 --- a/kernel/freezer.c +++ b/kernel/freezer.c @@ -202,7 +202,7 @@ void __thaw_task(struct task_struct *p) if (WARN_ON_ONCE(freezing(p))) goto unlock; - if (task_call_func(p, __restore_freezer_state, NULL)) + if (!frozen(p) || task_call_func(p, __restore_freezer_state, NULL)) goto unlock; wake_up_state(p, TASK_FROZEN); |