Re: [PATCH -fix] swsusp: Make userland suspend work on SMP again

[Andrew Morton <akpm@osdl.org>]

On Wed, 4 Oct 2006 22:26:42 +0200
"Rafael J. Wysocki" <rjw@sisk.pl> wrote:

> Unfortunately one of the recent changes in swsusp has broken the userland
> suspend on SMP.  Fix it.
> 

Which patch does this fix?

> ---
> ---
>  kernel/power/user.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6.18-mm3/kernel/power/user.c

I'll assume from this that your patch is applicable to -mm and that mainline
doesn't have this bug.

I'll further assume that it's swsusp-add-ioctl-for-swap-files-support.patch
which added the bug.

> ===================================================================
> --- linux-2.6.18-mm3.orig/kernel/power/user.c
> +++ linux-2.6.18-mm3/kernel/power/user.c
> @@ -149,10 +149,10 @@ static int snapshot_ioctl(struct inode *
>  			error = freeze_processes();
>  			if (error) {
>  				thaw_processes();
> +				enable_nonboot_cpus();
>  				error = -EBUSY;
>  			}
>  		}
> -		enable_nonboot_cpus();
>  		up(&pm_sem);
>  		if (!error)
>  			data->frozen = 1;