aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/lib/zimage.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/lib/zimage.c')
-rw-r--r--arch/x86/lib/zimage.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index d224db4e07e..eae26635b1b 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -24,6 +24,7 @@
#include <asm/arch/timestamp.h>
#endif
#include <linux/compiler.h>
+#include "acpi_table.h"
DECLARE_GLOBAL_DATA_PTR;
@@ -255,6 +256,11 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
#endif
+#ifdef CONFIG_GENERATE_ACPI_TABLE
+ if (bootproto >= 0x020e)
+ hdr->acpi_rsdp_addr = acpi_rsdp_addr;
+#endif
+
setup_video(&setup_base->screen_info);
return 0;