projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swsusp: do not use page flags
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
kernel
/
power
/
disk.c
diff --git
a/kernel/power/disk.c
b/kernel/power/disk.c
index
8df51c2
..
403bc37
100644
(file)
--- a/
kernel/power/disk.c
+++ b/
kernel/power/disk.c
@@
-139,14
+139,19
@@
int pm_suspend_disk(void)
mdelay(5000);
goto Thaw;
}
mdelay(5000);
goto Thaw;
}
+ /* Allocate memory management structures */
+ error = create_basic_memory_bitmaps();
+ if (error)
+ goto Thaw;
+
/* Free memory before shutting down devices. */
error = swsusp_shrink_memory();
if (error)
/* Free memory before shutting down devices. */
error = swsusp_shrink_memory();
if (error)
- goto
Thaw
;
+ goto
Finish
;
error = platform_prepare();
if (error)
error = platform_prepare();
if (error)
- goto
Thaw
;
+ goto
Finish
;
suspend_console();
error = device_suspend(PMSG_FREEZE);
suspend_console();
error = device_suspend(PMSG_FREEZE);
@@
-181,7
+186,7
@@
int pm_suspend_disk(void)
power_down();
else {
swsusp_free();
power_down();
else {
swsusp_free();
- goto
Thaw
;
+ goto
Finish
;
}
} else {
pr_debug("PM: Image restored successfully.\n");
}
} else {
pr_debug("PM: Image restored successfully.\n");
@@
-194,6
+199,8
@@
int pm_suspend_disk(void)
platform_finish();
device_resume();
resume_console();
platform_finish();
device_resume();
resume_console();
+ Finish:
+ free_basic_memory_bitmaps();
Thaw:
unprepare_processes();
return error;
Thaw:
unprepare_processes();
return error;
@@
-239,13
+246,15
@@
static int software_resume(void)
}
pr_debug("PM: Checking swsusp image.\n");
}
pr_debug("PM: Checking swsusp image.\n");
-
error = swsusp_check();
if (error)
error = swsusp_check();
if (error)
- goto
Done
;
+ goto
Unlock
;
- pr_debug("PM: Preparing processes for restore.\n");
+ error = create_basic_memory_bitmaps();
+ if (error)
+ goto Unlock;
+ pr_debug("PM: Preparing processes for restore.\n");
error = prepare_processes();
if (error) {
swsusp_close();
error = prepare_processes();
if (error) {
swsusp_close();
@@
-280,7
+289,9
@@
static int software_resume(void)
printk(KERN_ERR "PM: Restore failed, recovering.\n");
unprepare_processes();
Done:
printk(KERN_ERR "PM: Restore failed, recovering.\n");
unprepare_processes();
Done:
+ free_basic_memory_bitmaps();
/* For success case, the suspend path will release the lock */
/* For success case, the suspend path will release the lock */
+ Unlock:
mutex_unlock(&pm_mutex);
pr_debug("PM: Resume from disk failed.\n");
return 0;
mutex_unlock(&pm_mutex);
pr_debug("PM: Resume from disk failed.\n");
return 0;