On Wed, Dec 13, 2023 at 10:09 AM Kevin Hao <haokexin@xxxxxxxxx> wrote: > > A freezable kernel thread can enter frozen state during freezing by > either calling try_to_freeze() or using wait_event_freezable() and its > variants. However, there is no need to use both methods simultaneously. The changelog doesn't match the patch IMV. > Signed-off-by: Kevin Hao <haokexin@xxxxxxxxx> > Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> > Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx> > Cc: Pavel Machek <pavel@xxxxxx> > --- > mm/ksm.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/mm/ksm.c b/mm/ksm.c > index 16532fa85a46..e2ce850c2739 100644 > --- a/mm/ksm.c > +++ b/mm/ksm.c > @@ -2604,11 +2604,9 @@ static int ksm_scan_thread(void *nothing) > ksm_do_scan(ksm_thread_pages_to_scan); > mutex_unlock(&ksm_thread_mutex); > > - try_to_freeze(); > - > if (ksmd_should_run()) { > sleep_ms = READ_ONCE(ksm_thread_sleep_millisecs); > - wait_event_interruptible_timeout(ksm_iter_wait, > + wait_event_freezable_timeout(ksm_iter_wait, > sleep_ms != READ_ONCE(ksm_thread_sleep_millisecs), > msecs_to_jiffies(sleep_ms)); > } else { > -- > 2.39.2 >