OSDN Git Service

x86/boot: Fix boot regression caused by bootparam sanitizing
authorJohn Hubbard <jhubbard@nvidia.com>
Wed, 21 Aug 2019 19:25:13 +0000 (12:25 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 21 Aug 2019 20:37:09 +0000 (22:37 +0200)
commit7846f58fba964af7cb8cf77d4d13c33254725211
tree69fb381a81aaa2366c73bea181153695f84135e5
parentc49a0a80137c7ca7d6ced4c812c9e07a949f6f24
x86/boot: Fix boot regression caused by bootparam sanitizing

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 <neil@nmacleod.com>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Neil MacLeod <neil@nmacleod.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20190821192513.20126-1-jhubbard@nvidia.com
arch/x86/include/asm/bootparam_utils.h