diff options
| author | Linus Torvalds | 2018-12-10 00:09:55 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2018-12-10 00:09:55 +0100 |
| commit | 8586ca8a214471e4573d76356aabe890bfecdc8a (patch) | |
| tree | c64f9f0f8945719e67f91007cf8b369be5d8e04f /arch/x86/include/asm | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | x86/vdso: Drop implicit common-page-size linker flag (diff) | |
| download | kernel-qcow2-linux-8586ca8a214471e4573d76356aabe890bfecdc8a.tar.gz kernel-qcow2-linux-8586ca8a214471e4573d76356aabe890bfecdc8a.tar.xz kernel-qcow2-linux-8586ca8a214471e4573d76356aabe890bfecdc8a.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Three fixes: a boot parameter re-(re-)fix, a retpoline build artifact
fix and an LLVM workaround"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/vdso: Drop implicit common-page-size linker flag
x86/build: Fix compiler support check for CONFIG_RETPOLINE
x86/boot: Clear RSDP address in boot_params for broken loaders
Diffstat (limited to 'arch/x86/include/asm')
| -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); |