diff --git a/packages/linux/patches/default/linux-0001-fix-5.3-rc5.patch b/packages/linux/patches/default/linux-0001-fix-5.3-rc5.patch new file mode 100644 index 0000000000..cb75fec555 --- /dev/null +++ b/packages/linux/patches/default/linux-0001-fix-5.3-rc5.patch @@ -0,0 +1,46 @@ +From 5df5efe16f1e8a1db98bd6a6e447bc02d5b799e1 Mon Sep 17 00:00:00 2001 +From: John Hubbard +Date: Wed, 21 Aug 2019 12:25:13 -0700 +Subject: [PATCH] x86/boot: Fix boot failure regression + +commit a90118c445cc ("x86/boot: Save fields explicitly, zero out +everything else") had two errors: + + * It preserved boot_params.acpi_rsdp_addr, and + * It failed to preserve boot_params.hdr + +Therefore, zero out acpi_rsdp_addr, and preserve hdr. + +Fixes: a90118c445cc ("x86/boot: Save fields explicitly, zero out everything else") +Reported-by: Neil MacLeod +Suggested-by: Thomas Gleixner +Cc: H. Peter Anvin +Cc: stable@vger.kernel.org +Signed-off-by: John Hubbard +--- + arch/x86/include/asm/bootparam_utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h +index f5e90a8..9e5f3c7 100644 +--- a/arch/x86/include/asm/bootparam_utils.h ++++ b/arch/x86/include/asm/bootparam_utils.h +@@ -59,7 +59,6 @@ static void sanitize_boot_params(struct boot_params *boot_params) + BOOT_PARAM_PRESERVE(apm_bios_info), + BOOT_PARAM_PRESERVE(tboot_addr), + BOOT_PARAM_PRESERVE(ist_info), +- BOOT_PARAM_PRESERVE(acpi_rsdp_addr), + BOOT_PARAM_PRESERVE(hd0_info), + BOOT_PARAM_PRESERVE(hd1_info), + BOOT_PARAM_PRESERVE(sys_desc_table), +@@ -71,6 +70,7 @@ static void sanitize_boot_params(struct boot_params *boot_params) + BOOT_PARAM_PRESERVE(eddbuf_entries), + BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries), + BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer), ++ BOOT_PARAM_PRESERVE(hdr), + BOOT_PARAM_PRESERVE(e820_table), + BOOT_PARAM_PRESERVE(eddbuf), + }; +-- +2.14.1 +