diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 11:41:19 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 11:41:19 -0700 |
| commit | 4af6600fd793023c01634cca5abfe4a2b707788f (patch) | |
| tree | 9e3a830d7782512b492011932ddd789d13a900c4 /drivers/xen/manage.c | |
| parent | 447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (diff) | |
| parent | 68da166491655bc54051bf04c78ce648e2e33508 (diff) | |
| download | op-kernel-dev-4af6600fd793023c01634cca5abfe4a2b707788f.zip op-kernel-dev-4af6600fd793023c01634cca5abfe4a2b707788f.tar.gz | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 3.18.
Diffstat (limited to 'drivers/xen/manage.c')
| -rw-r--r-- | drivers/xen/manage.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 5f1e1f3..f8bb36f 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -103,16 +103,11 @@ static void do_suspend(void) shutting_down = SHUTDOWN_SUSPEND; -#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 - during suspend. */ err = freeze_processes(); if (err) { pr_err("%s: freeze failed %d\n", __func__, err); goto out; } -#endif err = dpm_suspend_start(PMSG_FREEZE); if (err) { @@ -157,10 +152,8 @@ out_resume: dpm_resume_end(si.cancelled ? PMSG_THAW : PMSG_RESTORE); out_thaw: -#ifdef CONFIG_PREEMPT thaw_processes(); out: -#endif shutting_down = SHUTDOWN_INVALID; } #endif /* CONFIG_HIBERNATE_CALLBACKS */ |
