projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm
[firefly-linux-kernel-4.4.55.git]
/
init
/
initramfs.c
diff --git
a/init/initramfs.c
b/init/initramfs.c
index 84c6bf111300878a095a9fb3f8f91678dbe10b65..a67ef9dbda9dae0ea7a1619a393c55157a6d8592 100644
(file)
--- a/
init/initramfs.c
+++ b/
init/initramfs.c
@@
-592,7
+592,7
@@
static int __init populate_rootfs(void)
initrd_end - initrd_start);
if (!err) {
free_initrd();
initrd_end - initrd_start);
if (!err) {
free_initrd();
-
return 0
;
+
goto done
;
} else {
clean_rootfs();
unpack_to_rootfs(__initramfs_start, __initramfs_size);
} else {
clean_rootfs();
unpack_to_rootfs(__initramfs_start, __initramfs_size);
@@
-607,6
+607,7
@@
static int __init populate_rootfs(void)
sys_close(fd);
free_initrd();
}
sys_close(fd);
free_initrd();
}
+ done:
#else
printk(KERN_INFO "Unpacking initramfs...\n");
err = unpack_to_rootfs((char *)initrd_start,
#else
printk(KERN_INFO "Unpacking initramfs...\n");
err = unpack_to_rootfs((char *)initrd_start,
@@
-615,6
+616,11
@@
static int __init populate_rootfs(void)
printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
free_initrd();
#endif
printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
free_initrd();
#endif
+ /*
+ * Try loading default modules from initramfs. This gives
+ * us a chance to load before device_initcalls.
+ */
+ load_default_modules();
}
return 0;
}
}
return 0;
}