summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorThomas Renninger2012-10-01 00:23:54 +0200
committerH. Peter Anvin2012-10-01 03:03:23 +0200
commit53aac44c904abbad9f474f652f099de13b5c3563 (patch)
treebda5d70da49a83cb2c0c1dc2c35aae8d9235b782 /arch/x86/kernel/setup.c
parentx86, acpi: Introduce x86 arch specific arch_reserve_mem_area() for e820 handling (diff)
downloadkernel-qcow2-linux-53aac44c904abbad9f474f652f099de13b5c3563.tar.gz
kernel-qcow2-linux-53aac44c904abbad9f474f652f099de13b5c3563.tar.xz
kernel-qcow2-linux-53aac44c904abbad9f474f652f099de13b5c3563.zip
ACPI: Store valid ACPI tables passed via early initrd in reserved memblock areas
A later patch will compare them with ACPI tables that get loaded at boot or runtime and if criteria match, a stored one is loaded. Signed-off-by: Thomas Renninger <trenn@suse.de> Link: http://lkml.kernel.org/r/1349043837-22659-4-git-send-email-trenn@suse.de Cc: Len Brown <lenb@kernel.org> Cc: Robert Moore <robert.moore@intel.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Eric Piel <eric.piel@tremplin-utc.net> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f4b9b80e1b95..764e543b2297 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -941,6 +941,8 @@ void __init setup_arch(char **cmdline_p)
reserve_initrd();
+ acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start);
+
reserve_crashkernel();
vsmp_init();