swsusp: do not use page flags

[profile/ivi/kernel-adaptation-intel-automotive.git] / kernel / power / user.c

diff --git a/kernel/power/user.c b/kernel/power/user.c
index dd09efe..845acd8 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -52,6 +52,9 @@ static int snapshot_open(struct inode *inode, struct file *filp)
        if ((filp->f_flags & O_ACCMODE) == O_RDWR)
                return -ENOSYS;
 
+       if(create_basic_memory_bitmaps())
+               return -ENOMEM;
+
        nonseekable_open(inode, filp);
        data = &snapshot_state;
        filp->private_data = data;
@@ -77,6 +80,7 @@ static int snapshot_release(struct inode *inode, struct file *filp)
        struct snapshot_data *data;
 
        swsusp_free();
+       free_basic_memory_bitmaps();
        data = filp->private_data;
        free_all_swap_pages(data->swap, data->bitmap);
        free_bitmap(data->bitmap);
@@ -368,9 +372,12 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                if (error) {
                        printk(KERN_ERR "Failed to suspend some devices.\n");
                } else {
-                       /* Enter S3, system is already frozen */
-                       suspend_enter(PM_SUSPEND_MEM);
-
+                       error = disable_nonboot_cpus();
+                       if (!error) {
+                               /* Enter S3, system is already frozen */
+                               suspend_enter(PM_SUSPEND_MEM);
+                               enable_nonboot_cpus();
+                       }
                        /* Wake up devices */
                        device_resume();
                }