From: Corey Minyard cminyard@mvista.com

Change

a90118c445cc x86/boot: Save fields explicitly, zero out everything else

modified the way boot parameters were saved on x86. When this was backported, e820_table didn't exists, and that change was dropped. Unfortunately, e820_table did exist, it was just named e820_map in this kernel version.

This was breaking booting on a Supermicro Super Server/A2SDi-2C-HLN4F with a Denverton CPU. Adding e820_map to the saved boot params table fixes the issue.

Cc: stable@vger.kernel.org # 4.9.x, 4.4.x Signed-off-by: Corey Minyard cminyard@mvista.com --- I checked the stable mailing lists and didn't see any discussion of this, I hope it's not a dup, but some systems will be broken without this.

I wasn't sure how to add a "Fixes:" field in a situation like this.

arch/x86/include/asm/bootparam_utils.h | 1 + 1 file changed, 1 insertion(+)

diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h index 0232b5a2a2d9..588d8fbd1e6d 100644 --- a/arch/x86/include/asm/bootparam_utils.h +++ b/arch/x86/include/asm/bootparam_utils.h @@ -71,6 +71,7 @@ static void sanitize_boot_params(struct boot_params *boot_params) BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries), BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer), BOOT_PARAM_PRESERVE(hdr), + BOOT_PARAM_PRESERVE(e820_map), BOOT_PARAM_PRESERVE(eddbuf), };