diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-03-25 03:53:42 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-03-25 03:53:42 -0300 |
| commit | 03dd4cb26d967f9588437b0fc9cc0e8353322bb7 (patch) | |
| tree | fa581f6dc1c0596391690d1f67eceef3af8246dc /init/do_mounts_initrd.c | |
| parent | d4e493caf788ef44982e131ff9c786546904d934 (diff) | |
Linux-libre 4.5-gnu
Diffstat (limited to 'init/do_mounts_initrd.c')
| -rw-r--r-- | init/do_mounts_initrd.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index a49c59680..a1000ca29 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -15,7 +15,6 @@ #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> @@ -80,11 +79,6 @@ static void __init handle_initrd(void) 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 */ @@ -122,7 +116,7 @@ static void __init handle_initrd(void) } } -int __init initrd_load(void) +bool __init initrd_load(void) { if (mount_initrd) { create_dev("/dev/ram", Root_RAM0); @@ -135,9 +129,9 @@ int __init initrd_load(void) if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) { sys_unlink("/initrd.image"); handle_initrd(); - return 1; + return true; } } sys_unlink("/initrd.image"); - return 0; + return false; } |