From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: Re: [PATCH] xen: resume console a bit later Date: Wed, 02 Jul 2014 12:58:15 -0400 Message-ID: <53B43A27.3070007@oracle.com> References: <1404318919-28626-1-git-send-email-david.vrabel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2NpT-0001s3-JF for xen-devel@lists.xenproject.org; Wed, 02 Jul 2014 16:56:19 +0000 In-Reply-To: <1404318919-28626-1-git-send-email-david.vrabel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: David Vrabel Cc: xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org 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 Reviewed-by: Boris Ostrovsky > --- > 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);