diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-12-17 18:48:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-12-17 18:48:25 +0100 |
| commit | 02117e42db7470e59910088b2b0ee42d581d2651 (patch) | |
| tree | 7734414b46fb72ffc708ac924f3b6b69de1f0d4c /arch/x86/include/asm/bootparam_utils.h | |
| parent | ba6f508d0ec4adb09f0a939af6d5e19cdfa8667d (diff) | |
| parent | 721066dfd4d5c0fee5772c777d6930d0f423b4eb (diff) | |
| download | linux-02117e42db7470e59910088b2b0ee42d581d2651.tar.gz linux-02117e42db7470e59910088b2b0ee42d581d2651.tar.bz2 linux-02117e42db7470e59910088b2b0ee42d581d2651.zip | |
Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/bootparam_utils.h')
| -rw-r--r-- | arch/x86/include/asm/bootparam_utils.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h index a07ffd23e4dd..f6f6ef436599 100644 --- a/arch/x86/include/asm/bootparam_utils.h +++ b/arch/x86/include/asm/bootparam_utils.h @@ -36,6 +36,7 @@ static void sanitize_boot_params(struct boot_params *boot_params) */ if (boot_params->sentinel) { /* fields in boot_params are left uninitialized, clear them */ + boot_params->acpi_rsdp_addr = 0; memset(&boot_params->ext_ramdisk_image, 0, (char *)&boot_params->efi_info - (char *)&boot_params->ext_ramdisk_image); |