x86/kexec: Fill in acpi_rsdp_addr from the first kernel

[sfrench/cifs-2.6.git] / arch / x86 / kernel / kexec-bzimage64.c

diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index 0d5efa34f35966f0b272797f737252ed8bdb23a6..2a0ff871025a7085d6dc184e85548a6b14d4b3ed 100644 (file)
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -215,6 +215,9 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,
        params->screen_info.ext_mem_k = 0;
        params->alt_mem_k = 0;
 
+       /* Always fill in RSDP: it is either 0 or a valid value */
+       params->acpi_rsdp_addr = boot_params.acpi_rsdp_addr;
+
        /* Default APM info */
        memset(&params->apm_bios_info, 0, sizeof(params->apm_bios_info));
 
@@ -253,7 +256,6 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,
        setup_efi_state(params, params_load_addr, efi_map_offset, efi_map_sz,
                        efi_setup_data_offset);
 #endif
-
        /* Setup EDD info */
        memcpy(params->eddbuf, boot_params.eddbuf,
                                EDDMAXNR * sizeof(struct edd_info));