tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 8586ca8a ebbd3000

+10 -5
+7 -3
arch/x86/Makefile
··· 220 220 221 221 # Avoid indirect branches in kernel to deal with Spectre 222 222 ifdef CONFIG_RETPOLINE 223 - ifeq ($(RETPOLINE_CFLAGS),) 224 - $(error You are building kernel with non-retpoline compiler, please update your compiler.) 225 - endif 226 223 KBUILD_CFLAGS += $(RETPOLINE_CFLAGS) 227 224 endif 228 225 ··· 303 306 ifndef CC_HAVE_ASM_GOTO 304 307 @echo Compiler lacks asm-goto support. 305 308 @exit 1 309 + endif 310 + ifdef CONFIG_RETPOLINE 311 + ifeq ($(RETPOLINE_CFLAGS),) 312 + @echo "You are building kernel with non-retpoline compiler." >&2 313 + @echo "Please update your compiler." >&2 314 + @false 315 + endif 306 316 endif 307 317 308 318 archclean:
+2 -2
arch/x86/entry/vdso/Makefile
··· 47 47 CPPFLAGS_vdso.lds += -P -C 48 48 49 49 VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \ 50 - -z max-page-size=4096 -z common-page-size=4096 50 + -z max-page-size=4096 51 51 52 52 $(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE 53 53 $(call if_changed,vdso) ··· 98 98 99 99 CPPFLAGS_vdsox32.lds = $(CPPFLAGS_vdso.lds) 100 100 VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \ 101 - -z max-page-size=4096 -z common-page-size=4096 101 + -z max-page-size=4096 102 102 103 103 # x32-rebranded versions 104 104 vobjx32s-y := $(vobjs-y:.o=-x32.o)
+1
arch/x86/include/asm/bootparam_utils.h
··· 36 36 */ 37 37 if (boot_params->sentinel) { 38 38 /* fields in boot_params are left uninitialized, clear them */ 39 + boot_params->acpi_rsdp_addr = 0; 39 40 memset(&boot_params->ext_ramdisk_image, 0, 40 41 (char *)&boot_params->efi_info - 41 42 (char *)&boot_params->ext_ramdisk_image);