Commit d2862360 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 and PTI fixes from Ingo Molnar:
 "Misc fixes:

   - fix EFI pagetables freeing

   - fix vsyscall pagetable setting on Xen PV guests

   - remove ancient CONFIG_X86_PPRO_FENCE=y - x86 is TSO again

   - fix two binutils (ld) development version related incompatibilities

   - clean up breakpoint handling

   - fix an x86 self-test"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/entry/64: Don't use IST entry for #BP stack
  x86/efi: Free efi_pgd with free_pages()
  x86/vsyscall/64: Use proper accessor to update P4D entry
  x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk
  x86/boot/64: Verify alignment of the LOAD segment
  x86/build/64: Force the linker to use 2MB page size
  selftests/x86/ptrace_syscall: Fix for yet more glibc interference
parents 9fd64e8a d8ba61ba

arch/x86/Kconfig.cpu

+0 −13
Original line number Diff line number Diff line
@@ -315,19 +315,6 @@ config X86_L1_CACHE_SHIFT 
	default "4" if MELAN || M486 || MGEODEGX1

	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX



config X86_PPRO_FENCE

	bool "PentiumPro memory ordering errata workaround"

	depends on M686 || M586MMX || M586TSC || M586 || M486 || MGEODEGX1

	---help---

	  Old PentiumPro multiprocessor systems had errata that could cause

	  memory operations to violate the x86 ordering standard in rare cases.

	  Enabling this option will attempt to work around some (but not all)

	  occurrences of this problem, at the cost of much heavier spinlock and

	  memory barrier operations.



	  If unsure, say n here. Even distro kernels should think twice before

	  enabling this: there are few systems, and an unlikely bug.



config X86_F00F_BUG

	def_bool y

	depends on M586MMX || M586TSC || M586 || M486

arch/x86/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -223,6 +223,15 @@ KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) $(asinstr) $(avx_instr) 


LDFLAGS := -m elf_$(UTS_MACHINE)



#

# The 64-bit kernel must be aligned to 2MB.  Pass -z max-page-size=0x200000 to

# the linker to force 2MB page size regardless of the default page size used

# by the linker.

#

ifdef CONFIG_X86_64

LDFLAGS += $(call ld-option, -z max-page-size=0x200000)

endif



# Speed up the build

KBUILD_CFLAGS += -pipe

# Workaround for a gcc prelease that unfortunately was shipped in a suse release

arch/x86/boot/compressed/misc.c

+4 −0
Original line number Diff line number Diff line
@@ -309,6 +309,10 @@ static void parse_elf(void *output) 


		switch (phdr->p_type) {

		case PT_LOAD:

#ifdef CONFIG_X86_64

			if ((phdr->p_align % 0x200000) != 0)

				error("Alignment of LOAD segment isn't multiple of 2MB");

#endif

#ifdef CONFIG_RELOCATABLE

			dest = output;

			dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);

arch/x86/entry/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ apicinterrupt3 HYPERV_REENLIGHTENMENT_VECTOR \ 
#endif /* CONFIG_HYPERV */



idtentry debug			do_debug		has_error_code=0	paranoid=1 shift_ist=DEBUG_STACK

idtentry int3			do_int3			has_error_code=0	paranoid=1 shift_ist=DEBUG_STACK

idtentry int3			do_int3			has_error_code=0

idtentry stack_segment		do_stack_segment	has_error_code=1



#ifdef CONFIG_XEN

arch/x86/entry/vdso/vdso32/vclock_gettime.c

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#undef CONFIG_OPTIMIZE_INLINING

#endif



#undef CONFIG_X86_PPRO_FENCE



#ifdef CONFIG_X86_64



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE