X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=init%2Finitramfs.c;h=c0b1e0533d80d32080c8d44acf2ab9f9d90bcbb7;hb=6585b4a71f523485ecf33e7f4569be4095d63699;hp=d53fee8d8604a5514889bfcd93acee4dd882fae0;hpb=3e6bdf473f489664dac4d7511d26c7ac3dfdc748;p=linux-2.6

diff --git a/init/initramfs.c b/init/initramfs.c
index d53fee8d86..c0b1e0533d 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