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
Merge tag 'v3.10.65' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
init
/
do_mounts.c
diff --git
a/init/do_mounts.c
b/init/do_mounts.c
index a2b49f2c1bd81c82fcf6766b5509b2341b8b98d6..58be07107141476388b8421d9cc6b7c7dc5fb4de 100644
(file)
--- a/
init/do_mounts.c
+++ b/
init/do_mounts.c
@@
-281,6
+281,7
@@
fail:
done:
return res;
}
+EXPORT_SYMBOL_GPL(name_to_dev_t);
static int __init root_dev_setup(char *line)
{
@@
-582,6
+583,8
@@
void __init prepare_namespace(void)
if (is_floppy && rd_doload && rd_load_disk(0))
ROOT_DEV = Root_RAM0;
+ check_resume_attempted();
+
mount_root();
out:
devtmpfs_mount("dev");