luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen: don't call dpm_resume_noirq() with interrupts disabled.

Browse Source 
dpm_resume_noirq() takes a mutex, so it can't be called from a no-interrupt
context.  Don't call it from within the stop-machine function, but just
afterwards, since we're resuming anyway, regardless of what happened.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stable Kernel <stable@kernel.org>
This commit is contained in:
Jeremy Fitzhardinge 2009-11-24 09:58:49 -08:00
parent 499d19b82b
commit 922cc38ab7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/xen/manage.c
View File

@ -43,7 +43,6 @@ static int xen_suspend(void *data)
if (err) {
printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n",
err);
dpm_resume_noirq(PMSG_RESUME);
return err;
}
@ -69,7 +68,6 @@ static int xen_suspend(void *data)
}
sysdev_resume();
dpm_resume_noirq(PMSG_RESUME);
return 0;
}
@ -108,6 +106,9 @@ static void do_suspend(void)
}
err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));
dpm_resume_noirq(PMSG_RESUME);
if (err) {
printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
goto out;
@ -119,8 +120,6 @@ static void do_suspend(void)
} else
xs_suspend_cancel();
dpm_resume_noirq(PMSG_RESUME);
resume_devices:
dpm_resume_end(PMSG_RESUME);