diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 04:01:53 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 04:01:53 -0500 |
| commit | 81e242d0efafb319938d511b115088a5c4523c91 (patch) | |
| tree | be22aa41db2288fd7999524d719f333c766a367f /init/initramfs.c | |
| parent | a733a5da97b238e3e3167d3d0aee8fe1e8d04e97 (diff) | |
| parent | 04d94886b47b5133915021dcfb1108a8576f6ea7 (diff) | |
Merge branches 'release' and 'dsdt-override' into release
Diffstat (limited to 'init/initramfs.c')
| -rw-r--r-- | init/initramfs.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index d53fee8d860..c0b1e0533d8 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -538,7 +538,7 @@ skip: initrd_end = 0; } -static int __init populate_rootfs(void) +int __init populate_rootfs(void) { char *err = unpack_to_rootfs(__initramfs_start, __initramfs_end - __initramfs_start, 0); @@ -577,4 +577,10 @@ static int __init populate_rootfs(void) } 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); +#endif |