summaryrefslogtreecommitdiffstats
path: root/Documentation/acpi/dsdt-override.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-15 11:53:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-15 11:58:04 -0700
commit9a9e0d685553af76cb6ae2af93cca4913e7fcd47 (patch)
treec4f041b0f7fa28db46841336135d493d587435ea /Documentation/acpi/dsdt-override.txt
parentce636452343af0522d2666157dab9c2096f4f996 (diff)
downloadkernel-crypto-9a9e0d685553af76cb6ae2af93cca4913e7fcd47.tar.gz
kernel-crypto-9a9e0d685553af76cb6ae2af93cca4913e7fcd47.tar.xz
kernel-crypto-9a9e0d685553af76cb6ae2af93cca4913e7fcd47.zip
ACPI: Remove ACPI_CUSTOM_DSDT_INITRD option
This essentially reverts commit 71fc47a9adf8ee89e5c96a47222915c5485ac437 ("ACPI: basic initramfs DSDT override support"), because the code simply isn't ready. It did ugly things to the init sequence to populate the rootfs image early, but that just ended up showing other problems with the whole approach. The fact is, the VFS layer simply isn't initialized this early, and the relevant ACPI code should either run much later, or this shouldn't be done at all. For 2.6.25, we'll just pick the latter option. We can revisit this concept later if necessary. Cc: Dave Hansen <haveblue@us.ibm.com> Cc: Tilman Schmidt <tilman@imap.cc> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Thomas Renninger <trenn@suse.de> Cc: Eric Piel <eric.piel@tremplin-utc.net> Cc: Len Brown <len.brown@intel.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Markus Gaugusch <dsdt@gaugusch.at> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/acpi/dsdt-override.txt')
-rw-r--r--Documentation/acpi/dsdt-override.txt12
1 files changed, 2 insertions, 10 deletions
diff --git a/Documentation/acpi/dsdt-override.txt b/Documentation/acpi/dsdt-override.txt
index 5008f256a2d..febbb1ba4d2 100644
--- a/Documentation/acpi/dsdt-override.txt
+++ b/Documentation/acpi/dsdt-override.txt
@@ -1,15 +1,7 @@
-Linux supports two methods of overriding the BIOS DSDT:
+Linux supports a method of overriding the BIOS DSDT:
CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel.
-CONFIG_ACPI_CUSTOM_DSDT_INITRD adds the image to the initrd.
-
-When to use these methods is described in detail on the
+When to use this method is described in detail on the
Linux/ACPI home page:
http://www.lesswatts.org/projects/acpi/overridingDSDT.php
-
-Note that if both options are used, the DSDT supplied
-by the INITRD method takes precedence.
-
-Documentation/initramfs-add-dsdt.sh is provided for convenience
-for use with the CONFIG_ACPI_CUSTOM_DSDT_INITRD method.