Re: [Xen-devel] [PATCH] xen: resume console a bit later

[Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>]

On 07/02/2014 12:35 PM, David Vrabel wrote:
> Calling xen_console_resume() in xen_suspend() causes a (harmless)
> warning because it calls a function that might sleep.
>
> Resuming the console after the stop_machine() call returns avoids this
> warning.
>
> Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>


> ---
>   drivers/xen/manage.c |    5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
> index c3667b2..5f1e1f3 100644
> --- a/drivers/xen/manage.c
> +++ b/drivers/xen/manage.c
> @@ -88,7 +88,6 @@ static int xen_suspend(void *data)
>   
>   	if (!si->cancelled) {
>                 xen_irq_resume();
> -               xen_console_resume();
>                 xen_timer_resume();
>         }
>   
> @@ -135,6 +134,10 @@ static void do_suspend(void)
>   
>   	err = stop_machine(xen_suspend, &si, cpumask_of(0));
>   
> +	/* Resume console as early as possible. */
> +       if (!si.cancelled)
> +               xen_console_resume();
> +
>         raw_notifier_call_chain(&xen_resume_notifier, 0, NULL);
>   
>   	dpm_resume_start(si.cancelled ? PMSG_THAW : PMSG_RESTORE);

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel