Re: mm snapshot broken-out-2007-04-07-03-27.tar.gz uploaded

[Pavel Machek <pavel@ucw.cz>]

Hi!

> > > The mm snapshot broken-out-2007-04-07-03-27.tar.gz has been uploaded to
> > > 
> > >    ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/mm/broken-out-2007-04-07-03-27.tar.gz
> > > 
> > > It contains the following patches against 2.6.21-rc6:
> > 
> > suspend-to-disk doesn't work when pktgen module is loaded.
> > 
> > Stopping kernel threads timed out after 20 seconds (2 tasks refusing to freeze):
> >  kpktgend_0
> >  kpktgend_1
> > Restarting tasks ... done.
> > swsusp: Basic memory bitmaps freed
> 
> This?
> 
> --- a/net/core/pktgen.c~pktgen-add-try_to_freeze
> +++ a/net/core/pktgen.c
> @@ -128,6 +128,7 @@
>  #include <linux/ioport.h>
>  #include <linux/interrupt.h>
>  #include <linux/capability.h>
> +#include <linux/freezer.h>
>  #include <linux/delay.h>
>  #include <linux/timer.h>
>  #include <linux/list.h>
> @@ -3325,6 +3326,8 @@ static int pktgen_thread_worker(void *ar
>  			t->control &= ~(T_REMDEV);
>  		}
>  
> +		try_to_freeze();
> +
>  		set_current_state(TASK_INTERRUPTIBLE);

I'd actually prefer freezing it while in INTERRUPTIBLE, but both
versions are probably okay.

							Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html