Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[karo-tx-linux.git] / kernel / power / user.c

diff --git a/kernel/power/user.c b/kernel/power/user.c
index 8cabc405ca10e3289bdd9a7733a7bde56fe38f28..3f1539fbe48a8be9c9f5ecf86f13042b3fed523d 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -138,14 +138,11 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
        case SNAPSHOT_FREEZE:
                if (data->frozen)
                        break;
-               sys_sync();
                down(&pm_sem);
-               pm_prepare_console();
                disable_nonboot_cpus();
                if (freeze_processes()) {
                        thaw_processes();
                        enable_nonboot_cpus();
-                       pm_restore_console();
                        error = -EBUSY;
                }
                up(&pm_sem);
@@ -159,7 +156,6 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                down(&pm_sem);
                thaw_processes();
                enable_nonboot_cpus();
-               pm_restore_console();
                up(&pm_sem);
                data->frozen = 0;
                break;
@@ -270,6 +266,42 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                }
                break;
 
+       case SNAPSHOT_S2RAM:
+               if (!data->frozen) {
+                       error = -EPERM;
+                       break;
+               }
+
+               if (down_trylock(&pm_sem)) {
+                       error = -EBUSY;
+                       break;
+               }
+
+               if (pm_ops->prepare) {
+                       error = pm_ops->prepare(PM_SUSPEND_MEM);
+                       if (error)
+                               goto OutS3;
+               }
+
+               /* Put devices to sleep */
+               error = device_suspend(PMSG_SUSPEND);
+               if (error) {
+                       printk(KERN_ERR "Failed to suspend some devices.\n");
+               } else {
+                       /* Enter S3, system is already frozen */
+                       suspend_enter(PM_SUSPEND_MEM);
+
+                       /* Wake up devices */
+                       device_resume();
+               }
+
+               if (pm_ops->finish)
+                       pm_ops->finish(PM_SUSPEND_MEM);
+
+OutS3:
+               up(&pm_sem);
+               break;
+
        default:
                error = -ENOTTY;