projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup Makefile
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
init
/
do_mounts_initrd.c
diff --git
a/init/do_mounts_initrd.c
b/init/do_mounts_initrd.c
index 3e0878e8a80d65548ffac907a3285f9deea8d5a3..a49c59680576c6808770dcf580cd6db4382fa2e4 100644
(file)
--- a/
init/do_mounts_initrd.c
+++ b/
init/do_mounts_initrd.c
@@
-15,6
+15,7
@@
#include <linux/romfs_fs.h>
#include <linux/initrd.h>
#include <linux/sched.h>
#include <linux/romfs_fs.h>
#include <linux/initrd.h>
#include <linux/sched.h>
+#include <linux/suspend.h>
#include <linux/freezer.h>
#include <linux/kmod.h>
#include <linux/freezer.h>
#include <linux/kmod.h>
@@
-79,6
+80,11
@@
static void __init handle_initrd(void)
current->flags &= ~PF_FREEZER_SKIP;
current->flags &= ~PF_FREEZER_SKIP;
+ if (!resume_attempted)
+ printk(KERN_ERR "TuxOnIce: No attempt was made to resume from "
+ "any image that might exist.\n");
+ clear_toi_state(TOI_BOOT_TIME);
+
/* move initrd to rootfs' /old */
sys_mount("..", ".", NULL, MS_MOVE, NULL);
/* switch root and cwd back to / of rootfs */
/* move initrd to rootfs' /old */
sys_mount("..", ".", NULL, MS_MOVE, NULL);
/* switch root and cwd back to / of rootfs */