| Message ID | 20231220003535.714831-1-haokexin@gmail.com |
|---|---|
| State | Accepted |
| Commit | e0f4bd26e29bf6162cdc9dc6fb7522bde7b74d07 |
| Headers | show |
| Series | [v2] PM: Remove obsolete comment from unlock_system_sleep() | expand |
On Wed, Dec 20, 2023 at 1:35 AM Kevin Hao <haokexin@gmail.com> wrote: > > With the freezer changes introduced by commit f5d39b020809 > ("freezer,sched: Rewrite core freezer logic"), the comment in > unlock_system_sleep() has become obsolete, there is no need to > retain it. > > Signed-off-by: Kevin Hao <haokexin@gmail.com> > --- > v2: Remove the entire comment from unlock_system_sleep(). > > kernel/power/main.c | 16 ---------------- > 1 file changed, 16 deletions(-) > > diff --git a/kernel/power/main.c b/kernel/power/main.c > index f6425ae3e8b0..b1ae9b677d03 100644 > --- a/kernel/power/main.c > +++ b/kernel/power/main.c > @@ -60,22 +60,6 @@ EXPORT_SYMBOL_GPL(lock_system_sleep); > > void unlock_system_sleep(unsigned int flags) > { > - /* > - * Don't use freezer_count() because we don't want the call to > - * try_to_freeze() here. > - * > - * Reason: > - * Fundamentally, we just don't need it, because freezing condition > - * doesn't come into effect until we release the > - * system_transition_mutex lock, since the freezer always works with > - * system_transition_mutex held. > - * > - * More importantly, in the case of hibernation, > - * unlock_system_sleep() gets called in snapshot_read() and > - * snapshot_write() when the freezing condition is still in effect. > - * Which means, if we use try_to_freeze() here, it would make them > - * enter the refrigerator, thus causing hibernation to lockup. > - */ > if (!(flags & PF_NOFREEZE)) > current->flags &= ~PF_NOFREEZE; > mutex_unlock(&system_transition_mutex); > -- Applied as 6.8 material, thanks!
diff --git a/kernel/power/main.c b/kernel/power/main.c index f6425ae3e8b0..b1ae9b677d03 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -60,22 +60,6 @@ EXPORT_SYMBOL_GPL(lock_system_sleep); void unlock_system_sleep(unsigned int flags) { - /* - * Don't use freezer_count() because we don't want the call to - * try_to_freeze() here. - * - * Reason: - * Fundamentally, we just don't need it, because freezing condition - * doesn't come into effect until we release the - * system_transition_mutex lock, since the freezer always works with - * system_transition_mutex held. - * - * More importantly, in the case of hibernation, - * unlock_system_sleep() gets called in snapshot_read() and - * snapshot_write() when the freezing condition is still in effect. - * Which means, if we use try_to_freeze() here, it would make them - * enter the refrigerator, thus causing hibernation to lockup. - */ if (!(flags & PF_NOFREEZE)) current->flags &= ~PF_NOFREEZE; mutex_unlock(&system_transition_mutex);
With the freezer changes introduced by commit f5d39b020809 ("freezer,sched: Rewrite core freezer logic"), the comment in unlock_system_sleep() has become obsolete, there is no need to retain it. Signed-off-by: Kevin Hao <haokexin@gmail.com> --- v2: Remove the entire comment from unlock_system_sleep(). kernel/power/main.c | 16 ---------------- 1 file changed, 16 deletions(-)