History

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 committed 7 years ago

Commit 8586ca82 parents ebbd300 ac3e2333 files · +10 −5Browse files

Unified · Split

3 files
  1. arch/x86/Makefile +7 −3
  2. arch/x86/entry/vdso/Makefile +2 −2
  3. arch/x86/include/asm/bootparam_utils.h +1 −0
arch/x86/Makefile+7−3
@@ -220,9 +220,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables · 219 unmodified lines
220 220
221# Avoid indirect branches in kernel to deal with Spectre221# Avoid indirect branches in kernel to deal with Spectre
222ifdef CONFIG_RETPOLINE222ifdef CONFIG_RETPOLINE
223ifeq ($(RETPOLINE_CFLAGS),)
224 $(error You are building kernel with non-retpoline compiler, please update your compiler.)
225endif
226 KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)223 KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)
227endif224endif
228 225
@@ -307,6 +304,13 @@ ifndef CC_HAVE_ASM_GOTO · 78 unmodified lines
307 @echo Compiler lacks asm-goto support.304 @echo Compiler lacks asm-goto support.
308 @exit 1305 @exit 1
309endif306endif
307ifdef CONFIG_RETPOLINE
308ifeq ($(RETPOLINE_CFLAGS),)
309 @echo "You are building kernel with non-retpoline compiler." >&2
310 @echo "Please update your compiler." >&2
311 @false
312endif
313endif
310 314
311archclean:315archclean:
312 $(Q)rm -rf $(objtree)/arch/i386316 $(Q)rm -rf $(objtree)/arch/i386
arch/x86/entry/vdso/Makefile+2−2
@@ -47,7 +47,7 @@ targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so) · 46 unmodified lines
47CPPFLAGS_vdso.lds += -P -C47CPPFLAGS_vdso.lds += -P -C
48 48
49VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \49VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \
50 -z max-page-size=4096 -z common-page-size=409650 -z max-page-size=4096
51 51
52$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE52$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
53 $(call if_changed,vdso)53 $(call if_changed,vdso)
@@ -98,7 +98,7 @@ CFLAGS_REMOVE_vvar.o = -pg · 44 unmodified lines
98 98
99CPPFLAGS_vdsox32.lds = $(CPPFLAGS_vdso.lds)99CPPFLAGS_vdsox32.lds = $(CPPFLAGS_vdso.lds)
100VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \100VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \
101 -z max-page-size=4096 -z common-page-size=4096101 -z max-page-size=4096
102 102
103# x32-rebranded versions103# x32-rebranded versions
104vobjx32s-y := $(vobjs-y:.o=-x32.o)104vobjx32s-y := $(vobjs-y:.o=-x32.o)
arch/x86/include/asm/bootparam_utils.h+1−0
@@ -36,6 +36,7 @@ static void sanitize_boot_params(struct boot_params *boot_params) · 35 unmodified lines
36 */36 */
37 if (boot_params->sentinel) {37 if (boot_params->sentinel) {
38 /* fields in boot_params are left uninitialized, clear them */38 /* fields in boot_params are left uninitialized, clear them */
39 boot_params->acpi_rsdp_addr = 0;
39 memset(&boot_params->ext_ramdisk_image, 0,40 memset(&boot_params->ext_ramdisk_image, 0,
40 (char *)&boot_params->efi_info -41 (char *)&boot_params->efi_info -
41 (char *)&boot_params->ext_ramdisk_image);42 (char *)&boot_params->ext_ramdisk_image);