OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: don't let userspace spam allocations warnings
[uclinux-h8/linux.git]
/
init
/
initramfs.c
diff --git
a/init/initramfs.c
b/init/initramfs.c
index
7cea802
..
fca8996
100644
(file)
--- a/
init/initramfs.c
+++ b/
init/initramfs.c
@@
-550,6
+550,7
@@
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)
{
@@
-596,6
+597,7
@@
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)
{
@@
-638,10
+640,8
@@
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
}
free_initrd();
#endif
}