diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-08 18:11:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-08 18:11:19 +0200 |
| commit | e7858f52a5cb868289a72264534a1f05f3340c6c (patch) | |
| tree | aa7308603cf30d8aec6e45ecaddc6c8ed29d2edb /drivers | |
| parent | sched: Remove rq argument to the tracepoints (diff) | |
| parent | cpu_stop: add dummy implementation for UP (diff) | |
| download | linux-e7858f52a5cb868289a72264534a1f05f3340c6c.tar.xz linux-e7858f52a5cb868289a72264534a1f05f3340c6c.zip | |
Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into sched/core
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/manage.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 2ac4440e7b08..8943b8ccee1a 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -80,12 +80,6 @@ static void do_suspend(void) shutting_down = SHUTDOWN_SUSPEND; - err = stop_machine_create(); - if (err) { - printk(KERN_ERR "xen suspend: failed to setup stop_machine %d\n", err); - goto out; - } - #ifdef CONFIG_PREEMPT /* If the kernel is preemptible, we need to freeze all the processes to prevent them from being in the middle of a pagetable update @@ -93,7 +87,7 @@ static void do_suspend(void) err = freeze_processes(); if (err) { printk(KERN_ERR "xen suspend: freeze failed %d\n", err); - goto out_destroy_sm; + goto out; } #endif @@ -136,12 +130,8 @@ out_resume: out_thaw: #ifdef CONFIG_PREEMPT thaw_processes(); - -out_destroy_sm: -#endif - stop_machine_destroy(); - out: +#endif shutting_down = SHUTDOWN_INVALID; } #endif /* CONFIG_PM_SLEEP */ |