projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/etnaviv: potential NULL dereference
[linux-2.6-microblaze.git]
/
init
/
initramfs.c
diff --git
a/init/initramfs.c
b/init/initramfs.c
index
f6f4a1e
..
7cea802
100644
(file)
--- a/
init/initramfs.c
+++ b/
init/initramfs.c
@@
-550,7
+550,6
@@
skip:
initrd_end = 0;
}
initrd_end = 0;
}
-#ifdef CONFIG_BLK_DEV_RAM
#define BUF_SIZE 1024
static void __init clean_rootfs(void)
{
#define BUF_SIZE 1024
static void __init clean_rootfs(void)
{
@@
-597,7
+596,6
@@
static void __init clean_rootfs(void)
ksys_close(fd);
kfree(buf);
}
ksys_close(fd);
kfree(buf);
}
-#endif
static int __init populate_rootfs(void)
{
static int __init populate_rootfs(void)
{
@@
-640,18
+638,14
@@
static int __init populate_rootfs(void)
printk(KERN_INFO "Unpacking initramfs...\n");
err = unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start);
printk(KERN_INFO "Unpacking initramfs...\n");
err = unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start);
- if (err)
+ if (err)
{
printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
+ clean_rootfs();
+ }
free_initrd();
#endif
}
flush_delayed_fput();
free_initrd();
#endif
}
flush_delayed_fput();
- /*
- * Try loading default modules from initramfs. This gives
- * us a chance to load before device_initcalls.
- */
- load_default_modules();
-
return 0;
}
rootfs_initcall(populate_rootfs);
return 0;
}
rootfs_initcall(populate_rootfs);