projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETNS][DCCPV6]: Move the dccp_v6_ctl_sk on the struct net.
[deliverable/linux.git]
/
init
/
initramfs.c
diff --git
a/init/initramfs.c
b/init/initramfs.c
index c0b1e0533d80d32080c8d44acf2ab9f9d90bcbb7..d53fee8d8604a5514889bfcd93acee4dd882fae0 100644
(file)
--- a/
init/initramfs.c
+++ b/
init/initramfs.c
@@
-538,7
+538,7
@@
skip:
initrd_end = 0;
}
initrd_end = 0;
}
-int __init populate_rootfs(void)
+
static
int __init populate_rootfs(void)
{
char *err = unpack_to_rootfs(__initramfs_start,
__initramfs_end - __initramfs_start, 0);
{
char *err = unpack_to_rootfs(__initramfs_start,
__initramfs_end - __initramfs_start, 0);
@@
-577,10
+577,4
@@
int __init populate_rootfs(void)
}
return 0;
}
}
return 0;
}
-#ifndef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-/*
- * if this option is enabled, populate_rootfs() is called _earlier_ in the
- * boot sequence. This insures that the ACPI initialisation can find the file.
- */
rootfs_initcall(populate_rootfs);
rootfs_initcall(populate_rootfs);
-#endif
This page took
0.024619 seconds
and
5
git commands to generate.