diff options
| author | Markus Gaugusch <dsdt@gaugusch.at> | 2008-02-05 00:04:06 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-06 22:07:41 -0500 |
| commit | 71fc47a9adf8ee89e5c96a47222915c5485ac437 (patch) | |
| tree | a2eaefbb703dde933a9726eae7e6399761d40136 /init/initramfs.c | |
| parent | 488b5ec871191359b9b79262a3d48456dae7ea5f (diff) | |
| download | blackbird-op-linux-71fc47a9adf8ee89e5c96a47222915c5485ac437.tar.gz blackbird-op-linux-71fc47a9adf8ee89e5c96a47222915c5485ac437.zip | |
ACPI: basic initramfs DSDT override support
The basics of DSDT from initramfs. In case this option is selected,
populate_rootfs() is called a bit earlier to have the initramfs content
available during ACPI initialization.
This is a very similar path to the one available at
http://gaugusch.at/kernel.shtml but with some update in the
documentation, default set to No and the change of populate_rootfs() the
"Jeff Mahony way" (which avoids reading the initramfs twice).
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: Len Brown <len.brown@intel.com>
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 d53fee8d8604..c0b1e0533d80 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 |
